Skip to content

Commit 5424436

Browse files
committed
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.
1 parent 38564f8 commit 5424436

File tree

9 files changed

+15
-19
lines changed

9 files changed

+15
-19
lines changed

etc/refcards/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ PDF_CZECH = \
4040
PDF_FRENCH = \
4141
fr-dired-ref.pdf \
4242
fr-refcard.pdf \
43-
fr-survival.pdf \
43+
fr-survival.pdf
4444

4545
PDF_GERMAN = de-refcard.pdf
4646

lib-src/etags.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4282,7 +4282,7 @@ Yacc_entries (FILE *inf)
42824282
while (perhaps_more_input (file_pointer) \
42834283
&& (readline (&(line_buffer), file_pointer), \
42844284
(char_pointer) = (line_buffer).buffer, \
4285-
true)) \
4285+
true))
42864286

42874287
#define LOOKING_AT(cp, kw) /* kw is the keyword, a literal string */ \
42884288
((assert ("" kw), true) /* syntax error if not a literal string */ \

lisp/dabbrev.el

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@ See also `dabbrev-ignored-buffer-names'."
237237
:version "21.1")
238238

239239
(defcustom dabbrev-check-other-buffers t
240-
"Should \\[dabbrev-expand] look in other buffers?\
241-
240+
"Should \\[dabbrev-expand] look in other buffers?
242241
nil: Don't look in other buffers.
243242
t: Also look for expansions in the buffers pointed out by
244243
`dabbrev-select-buffers-function'.

lisp/org/org-id.el

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@
8383

8484
(defcustom org-id-link-to-org-use-id nil
8585
"Non-nil means storing a link to an Org file will use entry IDs.
86-
\\<org-mode-map>\
87-
86+
\\<org-mode-map>
8887
The variable can have the following values:
8988
9089
t Create an ID if needed to make a link to the current entry.

lisp/org/org.el

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -863,8 +863,7 @@ depends on, if any."
863863

864864
(defcustom org-support-shift-select nil
865865
"Non-nil means make shift-cursor commands select text when possible.
866-
\\<org-mode-map>\
867-
866+
\\<org-mode-map>
868867
In Emacs 23, when `shift-select-mode' is on, shifted cursor keys
869868
start selecting a region, or enlarge regions started in this way.
870869
In Org mode, in special contexts, these same keys are used for
@@ -2259,8 +2258,7 @@ See `org-file-apps'.")
22592258
("\\.x?html?\\'" . default)
22602259
("\\.pdf\\'" . default))
22612260
"External applications for opening `file:path' items in a document.
2262-
\\<org-mode-map>\
2263-
2261+
\\<org-mode-map>
22642262
Org mode uses system defaults for different file types, but
22652263
you can use this variable to set the application for a given file
22662264
extension. The entries in this list are cons cells where the car identifies

src/alloc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6384,7 +6384,7 @@ mark_object (Lisp_Object arg)
63846384
do { \
63856385
CHECK_ALLOCATED (); \
63866386
CHECK_LIVE (LIVEP); \
6387-
} while (0) \
6387+
} while (false)
63886388

63896389
/* Check both of the above conditions, for symbols. */
63906390
#define CHECK_ALLOCATED_AND_LIVE_SYMBOL() \
@@ -6394,7 +6394,7 @@ mark_object (Lisp_Object arg)
63946394
CHECK_ALLOCATED (); \
63956395
CHECK_LIVE (live_symbol_p); \
63966396
} \
6397-
} while (0) \
6397+
} while (false)
63986398

63996399
#else /* not GC_CHECK_MARKED_OBJECTS */
64006400

src/frame.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ FRAME_BOTTOM_DIVIDER_WIDTH (struct frame *f)
14801480
- FRAME_TOTAL_FRINGE_WIDTH (f) \
14811481
- FRAME_SCROLL_BAR_AREA_WIDTH (f) \
14821482
- 2 * FRAME_INTERNAL_BORDER_WIDTH (f)) \
1483-
/ FRAME_COLUMN_WIDTH (f)) \
1483+
/ FRAME_COLUMN_WIDTH (f))
14841484

14851485
#define FRAME_PIXEL_HEIGHT_TO_TEXT_LINES(f, height) \
14861486
(((height) \

src/regex-emacs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3432,7 +3432,7 @@ static bool bcmp_translate (re_char *, re_char *, ptrdiff_t,
34323432
{ \
34333433
d = string2; \
34343434
dend = end_match_2; \
3435-
} \
3435+
}
34363436

34373437
/* Test if at very beginning or at very end of the virtual concatenation
34383438
of STRING1 and STRING2. If only one string, it's STRING2. */

src/window.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
595595
#define WINDOW_BUFFER(W) \
596596
(WINDOW_LEAF_P(W) \
597597
? (W)->contents \
598-
: Qnil) \
598+
: Qnil)
599599

600600
/* Return the canonical column width of the frame of window W. */
601601
#define WINDOW_FRAME_COLUMN_WIDTH(W) \
@@ -649,21 +649,21 @@ wset_next_buffers (struct window *w, Lisp_Object val)
649649
#define WINDOW_RIGHTMOST_P(W) \
650650
(WINDOW_RIGHT_PIXEL_EDGE (W) \
651651
== (WINDOW_RIGHT_PIXEL_EDGE \
652-
(XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) \
652+
(XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W))))))
653653

654654
/* True if window W has no other windows below it on its frame (the
655655
minibuffer window is not counted in this respect unless W itself is a
656656
minibuffer window). */
657657
#define WINDOW_BOTTOMMOST_P(W) \
658658
(WINDOW_BOTTOM_PIXEL_EDGE (W) \
659659
== (WINDOW_BOTTOM_PIXEL_EDGE \
660-
(XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) \
660+
(XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W))))))
661661

662662
/* True if window W takes up the full width of its frame. */
663663
#define WINDOW_FULL_WIDTH_P(W) \
664664
(WINDOW_PIXEL_WIDTH (W) \
665665
== (WINDOW_PIXEL_WIDTH \
666-
(XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W)))))) \
666+
(XWINDOW (FRAME_ROOT_WINDOW (WINDOW_XFRAME (W))))))
667667

668668
/* Width of right divider of window W. */
669669
#define WINDOW_RIGHT_DIVIDER_WIDTH(W) \
@@ -1122,7 +1122,7 @@ struct glyph *get_phys_cursor_glyph (struct window *w);
11221122

11231123
/* True if WINDOW is a valid window. */
11241124
#define WINDOW_VALID_P(WINDOW) \
1125-
(WINDOWP (WINDOW) && !NILP (XWINDOW (WINDOW)->contents)) \
1125+
(WINDOWP (WINDOW) && !NILP (XWINDOW (WINDOW)->contents))
11261126

11271127
/* A window of any sort, leaf or interior, is "valid" if its
11281128
contents slot is non-nil. */

0 commit comments

Comments
 (0)