diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-05-22 23:58:55 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-05-22 23:59:36 -0700 |
| commit | 5424436452bc0b3d8a62a8398f92d0c2db81e22b (patch) | |
| tree | f011ba6d3bc6b03f36698c359c7d0df0f961469b /src | |
| parent | 38564f8a664347c42f7614d9c91e0d49e4a073e8 (diff) | |
| download | emacs-5424436452bc0b3d8a62a8398f92d0c2db81e22b.tar.gz | |
Avoid backslash-newline-newline in source code
* etc/refcards/Makefile (PDF_FRENCH):
* lib-src/etags.c (LOOP_ON_INPUT_LINES):
* lisp/dabbrev.el (dabbrev-check-other-buffers):
* lisp/org/org-id.el (org-id-link-to-org-use-id):
* lisp/org/org.el (org-support-shift-select, org-file-apps):
* src/alloc.c (CHECK_ALLOCATED_AND_LIVE)
(CHECK_ALLOCATED_AND_LIVE_SYMBOL):
* src/frame.h (FRAME_PIXEL_WIDTH_TO_TEXT_COLS):
* src/regex-emacs.c (PREFETCH_NOLIMIT):
* src/window.h (WINDOW_BUFFER):
Remove backslash-newline that immediately precedes another
newline, as this is not the usual style and is confusing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc.c | 4 | ||||
| -rw-r--r-- | src/frame.h | 2 | ||||
| -rw-r--r-- | src/regex-emacs.c | 2 | ||||
| -rw-r--r-- | src/window.h | 10 |
4 files changed, 9 insertions, 9 deletions
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. */ |