summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/refcards/Makefile2
-rw-r--r--lib-src/etags.c2
-rw-r--r--lisp/dabbrev.el3
-rw-r--r--lisp/org/org-id.el3
-rw-r--r--lisp/org/org.el6
-rw-r--r--src/alloc.c4
-rw-r--r--src/frame.h2
-rw-r--r--src/regex-emacs.c2
-rw-r--r--src/window.h10
9 files changed, 15 insertions, 19 deletions
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 469e8fa05cd..0ba6db5aa28 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -40,7 +40,7 @@ PDF_CZECH = \
PDF_FRENCH = \
fr-dired-ref.pdf \
fr-refcard.pdf \
- fr-survival.pdf \
+ fr-survival.pdf
PDF_GERMAN = de-refcard.pdf
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 949ab5a2c6b..6bd04d1f1c3 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4282,7 +4282,7 @@ Yacc_entries (FILE *inf)
while (perhaps_more_input (file_pointer) \
&& (readline (&(line_buffer), file_pointer), \
(char_pointer) = (line_buffer).buffer, \
- true)) \
+ true))
#define LOOKING_AT(cp, kw) /* kw is the keyword, a literal string */ \
((assert ("" kw), true) /* syntax error if not a literal string */ \
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index f1fae18e74b..aa22d6c754e 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -237,8 +237,7 @@ See also `dabbrev-ignored-buffer-names'."
:version "21.1")
(defcustom dabbrev-check-other-buffers t
- "Should \\[dabbrev-expand] look in other buffers?\
-
+ "Should \\[dabbrev-expand] look in other buffers?
nil: Don't look in other buffers.
t: Also look for expansions in the buffers pointed out by
`dabbrev-select-buffers-function'.
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 6a9d729c0a4..44cc7b2f14d 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -83,8 +83,7 @@
(defcustom org-id-link-to-org-use-id nil
"Non-nil means storing a link to an Org file will use entry IDs.
-\\<org-mode-map>\
-
+\\<org-mode-map>
The variable can have the following values:
t Create an ID if needed to make a link to the current entry.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index ce6dd24a83b..119d0a2566a 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -863,8 +863,7 @@ depends on, if any."
(defcustom org-support-shift-select nil
"Non-nil means make shift-cursor commands select text when possible.
-\\<org-mode-map>\
-
+\\<org-mode-map>
In Emacs 23, when `shift-select-mode' is on, shifted cursor keys
start selecting a region, or enlarge regions started in this way.
In Org mode, in special contexts, these same keys are used for
@@ -2259,8 +2258,7 @@ See `org-file-apps'.")
("\\.x?html?\\'" . default)
("\\.pdf\\'" . default))
"External applications for opening `file:path' items in a document.
-\\<org-mode-map>\
-
+\\<org-mode-map>
Org mode uses system defaults for different file types, but
you can use this variable to set the application for a given file
extension. The entries in this list are cons cells where the car identifies
diff --git a/src/alloc.c b/src/alloc.c
index af4adb3856e..5c5b56d02e9 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6384,7 +6384,7 @@ mark_object (Lisp_Object arg)
do { \
CHECK_ALLOCATED (); \
CHECK_LIVE (LIVEP); \
- } while (0) \
+ } while (false)
/* Check both of the above conditions, for symbols. */
#define CHECK_ALLOCATED_AND_LIVE_SYMBOL() \
@@ -6394,7 +6394,7 @@ mark_object (Lisp_Object arg)
CHECK_ALLOCATED (); \
CHECK_LIVE (live_symbol_p); \
} \
- } while (0) \
+ } while (false)
#else /* not GC_CHECK_MARKED_OBJECTS */
diff --git a/src/frame.h b/src/frame.h
index 781063340d8..fa45a32d6b6 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1480,7 +1480,7 @@ FRAME_BOTTOM_DIVIDER_WIDTH (struct frame *f)
- FRAME_TOTAL_FRINGE_WIDTH (f) \
- FRAME_SCROLL_BAR_AREA_WIDTH (f) \
- 2 * FRAME_INTERNAL_BORDER_WIDTH (f)) \
- / FRAME_COLUMN_WIDTH (f)) \
+ / FRAME_COLUMN_WIDTH (f))
#define FRAME_PIXEL_HEIGHT_TO_TEXT_LINES(f, height) \
(((height) \
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 8dc69805024..4cb17037c26 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -3432,7 +3432,7 @@ static bool bcmp_translate (re_char *, re_char *, ptrdiff_t,
{ \
d = string2; \
dend = end_match_2; \
- } \
+ }
/* Test if at very beginning or at very end of the virtual concatenation
of STRING1 and STRING2. If only one string, it's STRING2. */
diff --git a/src/window.h b/src/window.h
index fdef407041b..6b0f0e5d07c 100644
--- a/src/window.h
+++ b/src/window.h
@@ -595,7 +595,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
#define WINDOW_BUFFER(W) \
(WINDOW_LEAF_P(W) \
? (W)->contents \
- : Qnil) \
+ : Qnil)
/* Return the canonical column width of the frame of window W. */
#define WINDOW_FRAME_COLUMN_WIDTH(W) \
@@ -649,7 +649,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
#define WINDOW_RIGHTMOST_P(W) \
(WINDOW_RIGHT_PIXEL_EDGE (W) \
== (WINDOW_RIGHT_PIXEL_EDGE \
- (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) \
+ (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W))))))
/* True if window W has no other windows below it on its frame (the
minibuffer window is not counted in this respect unless W itself is a
@@ -657,13 +657,13 @@ wset_next_buffers (struct window *w, Lisp_Object val)
#define WINDOW_BOTTOMMOST_P(W) \
(WINDOW_BOTTOM_PIXEL_EDGE (W) \
== (WINDOW_BOTTOM_PIXEL_EDGE \
- (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) \
+ (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W))))))
/* True if window W takes up the full width of its frame. */
#define WINDOW_FULL_WIDTH_P(W) \
(WINDOW_PIXEL_WIDTH (W) \
== (WINDOW_PIXEL_WIDTH \
- (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) \
+ (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W))))))
/* Width of right divider of window W. */
#define WINDOW_RIGHT_DIVIDER_WIDTH(W) \
@@ -1122,7 +1122,7 @@ struct glyph *get_phys_cursor_glyph (struct window *w);
/* True if WINDOW is a valid window. */
#define WINDOW_VALID_P(WINDOW) \
- (WINDOWP (WINDOW) && !NILP (XWINDOW (WINDOW)->contents)) \
+ (WINDOWP (WINDOW) && !NILP (XWINDOW (WINDOW)->contents))
/* A window of any sort, leaf or interior, is "valid" if its
contents slot is non-nil. */
View Lorry Controller Status