; Whitespace fixes to silence git hooks

(cherry picked from commit 8c165834913bb0dca214acc4b82ba1d9d4ac0a82)

diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in
index 4f366c829c9bac60d146fd2ba71c339feb1787fe..3553f95336dff40978499bc5dd78196a52f925cb 100644 (file)
--- a/admin/charsets/Makefile.in
+++ b/admin/charsets/Makefile.in
@@ -311,4 +311,3 @@ gen-clean:
        rm -f ${CHARSETS} ${SED_SCRIPT} ${TRANS_TABLE} ${srcdir}/charsets.stamp
 
 maintainer-clean: gen-clean distclean
-

diff --git a/doc/misc/org-setup.org b/doc/misc/org-setup.org
index b567af30a2c75e36f0dbd5a8d81c0eea19db3e4d..63cb9a4c65422c0b0b48725f60f6d98aaaf8f937 100644 (file)
--- a/doc/misc/org-setup.org
+++ b/doc/misc/org-setup.org
@@ -50,4 +50,3 @@
 # The "kbd" macro turns KBD into @kbd{KBD}.  Additionally, it
 # encloses case-sensitive special keys (SPC, RET...) within @key{...}.
 #+macro: kbd (eval (org-texinfo-kbd-macro $1))
-

diff --git a/etc/EGLOT-NEWS b/etc/EGLOT-NEWS
index 20a2e6944263549e02e085c5d4f90e2c3fd93e28..7b53d5943ba00a8e3212ac8137b5fedf3182ce90 100644 (file)
--- a/etc/EGLOT-NEWS
+++ b/etc/EGLOT-NEWS
@@ -777,4 +777,3 @@ bug-reference-bug-regexp: "\\(\\(github\\|bug\\)#\\([0-9]+\\)\\)"
 bug-reference-url-format: eglot--debbugs-or-github-bug-uri
 paragraph-separate: "[  \f]"
 End:
-

diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 1446e04c3c47d152aeb9293e7391ccddb75bfb67..493f6dcebb209c42a742c04afa7e2baa4ef65a74 100644 (file)
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1939,7 +1939,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
                                 (cons (match-end 1) (match-beginning 2)))
                string-delims (cons open-delim (c-get-ml-closer open-delim)))
          (goto-char (caar string-delims))))
-       
+
        ;; Point is in the body of an ml string.
        ((and string-delims
             (>= (point) (cadar string-delims))

diff --git a/src/intervals.c b/src/intervals.c
index a6c7d938df7312903c7f8ecd07f7516d6ed80999..8b2366a5581f16d8b972e454a8baad5dc9c96084 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -2051,17 +2051,17 @@ set_point_both (ptrdiff_t charpos, ptrdiff_t bytepos)
 
       if (! EQ (leave_before, enter_before) && !NILP (leave_before))
        calln (leave_before, make_fixnum (old_position),
-              make_fixnum (charpos));
+              make_fixnum (charpos));
       if (! EQ (leave_after, enter_after) && !NILP (leave_after))
        calln (leave_after, make_fixnum (old_position),
-              make_fixnum (charpos));
+              make_fixnum (charpos));
 
       if (! EQ (enter_before, leave_before) && !NILP (enter_before))
        calln (enter_before, make_fixnum (old_position),
-              make_fixnum (charpos));
+              make_fixnum (charpos));
       if (! EQ (enter_after, leave_after) && !NILP (enter_after))
        calln (enter_after, make_fixnum (old_position),
-              make_fixnum (charpos));
+              make_fixnum (charpos));
     }
 }
 \f

diff --git a/src/term.c b/src/term.c
index ba7b14de1589c216588ee92e0fc43c45a2c745b2..cd4c1f45426b3b3fbc083b51645859eaff752699 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -3678,7 +3678,7 @@ tty_menu_help_callback (char const *help_string, int pane, int item)
   /* (menu-item MENU-NAME PANE-NUMBER)  */
   menu_object = list3 (Qmenu_item, pane_name, make_fixnum (pane));
   show_help_echo (help_string ? build_string (help_string) : Qnil,
-                 Qnil, menu_object, make_fixnum (item));
+                 Qnil, menu_object, make_fixnum (item));
 }
 
 struct tty_pop_down_menu