diff options
| author | Paul Eggert | 2019-05-22 23:58:55 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-05-22 23:59:36 -0700 |
| commit | 5424436452bc0b3d8a62a8398f92d0c2db81e22b (patch) | |
| tree | f011ba6d3bc6b03f36698c359c7d0df0f961469b /src | |
| parent | 38564f8a664347c42f7614d9c91e0d49e4a073e8 (diff) | |
| download | emacs-5424436452bc0b3d8a62a8398f92d0c2db81e22b.tar.gz emacs-5424436452bc0b3d8a62a8398f92d0c2db81e22b.zip | |
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) | |||
| 6384 | do { \ | 6384 | do { \ |
| 6385 | CHECK_ALLOCATED (); \ | 6385 | CHECK_ALLOCATED (); \ |
| 6386 | CHECK_LIVE (LIVEP); \ | 6386 | CHECK_LIVE (LIVEP); \ |
| 6387 | } while (0) \ | 6387 | } while (false) |
| 6388 | 6388 | ||
| 6389 | /* Check both of the above conditions, for symbols. */ | 6389 | /* Check both of the above conditions, for symbols. */ |
| 6390 | #define CHECK_ALLOCATED_AND_LIVE_SYMBOL() \ | 6390 | #define CHECK_ALLOCATED_AND_LIVE_SYMBOL() \ |
| @@ -6394,7 +6394,7 @@ mark_object (Lisp_Object arg) | |||
| 6394 | CHECK_ALLOCATED (); \ | 6394 | CHECK_ALLOCATED (); \ |
| 6395 | CHECK_LIVE (live_symbol_p); \ | 6395 | CHECK_LIVE (live_symbol_p); \ |
| 6396 | } \ | 6396 | } \ |
| 6397 | } while (0) \ | 6397 | } while (false) |
| 6398 | 6398 | ||
| 6399 | #else /* not GC_CHECK_MARKED_OBJECTS */ | 6399 | #else /* not GC_CHECK_MARKED_OBJECTS */ |
| 6400 | 6400 | ||
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) | |||
| 1480 | - FRAME_TOTAL_FRINGE_WIDTH (f) \ | 1480 | - FRAME_TOTAL_FRINGE_WIDTH (f) \ |
| 1481 | - FRAME_SCROLL_BAR_AREA_WIDTH (f) \ | 1481 | - FRAME_SCROLL_BAR_AREA_WIDTH (f) \ |
| 1482 | - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)) \ | 1482 | - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)) \ |
| 1483 | / FRAME_COLUMN_WIDTH (f)) \ | 1483 | / FRAME_COLUMN_WIDTH (f)) |
| 1484 | 1484 | ||
| 1485 | #define FRAME_PIXEL_HEIGHT_TO_TEXT_LINES(f, height) \ | 1485 | #define FRAME_PIXEL_HEIGHT_TO_TEXT_LINES(f, height) \ |
| 1486 | (((height) \ | 1486 | (((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, | |||
| 3432 | { \ | 3432 | { \ |
| 3433 | d = string2; \ | 3433 | d = string2; \ |
| 3434 | dend = end_match_2; \ | 3434 | dend = end_match_2; \ |
| 3435 | } \ | 3435 | } |
| 3436 | 3436 | ||
| 3437 | /* Test if at very beginning or at very end of the virtual concatenation | 3437 | /* Test if at very beginning or at very end of the virtual concatenation |
| 3438 | of STRING1 and STRING2. If only one string, it's STRING2. */ | 3438 | 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) | |||
| 595 | #define WINDOW_BUFFER(W) \ | 595 | #define WINDOW_BUFFER(W) \ |
| 596 | (WINDOW_LEAF_P(W) \ | 596 | (WINDOW_LEAF_P(W) \ |
| 597 | ? (W)->contents \ | 597 | ? (W)->contents \ |
| 598 | : Qnil) \ | 598 | : Qnil) |
| 599 | 599 | ||
| 600 | /* Return the canonical column width of the frame of window W. */ | 600 | /* Return the canonical column width of the frame of window W. */ |
| 601 | #define WINDOW_FRAME_COLUMN_WIDTH(W) \ | 601 | #define WINDOW_FRAME_COLUMN_WIDTH(W) \ |
| @@ -649,7 +649,7 @@ wset_next_buffers (struct window *w, Lisp_Object val) | |||
| 649 | #define WINDOW_RIGHTMOST_P(W) \ | 649 | #define WINDOW_RIGHTMOST_P(W) \ |
| 650 | (WINDOW_RIGHT_PIXEL_EDGE (W) \ | 650 | (WINDOW_RIGHT_PIXEL_EDGE (W) \ |
| 651 | == (WINDOW_RIGHT_PIXEL_EDGE \ | 651 | == (WINDOW_RIGHT_PIXEL_EDGE \ |
| 652 | (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) \ | 652 | (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) |
| 653 | 653 | ||
| 654 | /* True if window W has no other windows below it on its frame (the | 654 | /* True if window W has no other windows below it on its frame (the |
| 655 | minibuffer window is not counted in this respect unless W itself is a | 655 | 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) | |||
| 657 | #define WINDOW_BOTTOMMOST_P(W) \ | 657 | #define WINDOW_BOTTOMMOST_P(W) \ |
| 658 | (WINDOW_BOTTOM_PIXEL_EDGE (W) \ | 658 | (WINDOW_BOTTOM_PIXEL_EDGE (W) \ |
| 659 | == (WINDOW_BOTTOM_PIXEL_EDGE \ | 659 | == (WINDOW_BOTTOM_PIXEL_EDGE \ |
| 660 | (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) \ | 660 | (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) |
| 661 | 661 | ||
| 662 | /* True if window W takes up the full width of its frame. */ | 662 | /* True if window W takes up the full width of its frame. */ |
| 663 | #define WINDOW_FULL_WIDTH_P(W) \ | 663 | #define WINDOW_FULL_WIDTH_P(W) \ |
| 664 | (WINDOW_PIXEL_WIDTH (W) \ | 664 | (WINDOW_PIXEL_WIDTH (W) \ |
| 665 | == (WINDOW_PIXEL_WIDTH \ | 665 | == (WINDOW_PIXEL_WIDTH \ |
| 666 | (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) \ | 666 | (XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) |
| 667 | 667 | ||
| 668 | /* Width of right divider of window W. */ | 668 | /* Width of right divider of window W. */ |
| 669 | #define WINDOW_RIGHT_DIVIDER_WIDTH(W) \ | 669 | #define WINDOW_RIGHT_DIVIDER_WIDTH(W) \ |
| @@ -1122,7 +1122,7 @@ struct glyph *get_phys_cursor_glyph (struct window *w); | |||
| 1122 | 1122 | ||
| 1123 | /* True if WINDOW is a valid window. */ | 1123 | /* True if WINDOW is a valid window. */ |
| 1124 | #define WINDOW_VALID_P(WINDOW) \ | 1124 | #define WINDOW_VALID_P(WINDOW) \ |
| 1125 | (WINDOWP (WINDOW) && !NILP (XWINDOW (WINDOW)->contents)) \ | 1125 | (WINDOWP (WINDOW) && !NILP (XWINDOW (WINDOW)->contents)) |
| 1126 | 1126 | ||
| 1127 | /* A window of any sort, leaf or interior, is "valid" if its | 1127 | /* A window of any sort, leaf or interior, is "valid" if its |
| 1128 | contents slot is non-nil. */ | 1128 | contents slot is non-nil. */ |