Doc fixes for fclist and grep

[gnu-emacs] / src / cmds.c

diff --git a/src/cmds.c b/src/cmds.c
index 270fc39cabcbaafb4a79faccd86fa191cd198c74..1e44dddfbf6e8c52426fa3ebda46f9335c700001 100644 (file)
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -1,13 +1,13 @@
 /* Simple built-in editing commands.
 
 /* Simple built-in editing commands.
 

-Copyright (C) 1985, 1993-1998, 2001-2015 Free Software Foundation, Inc.
+Copyright (C) 1985, 1993-1998, 2001-2016 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.

 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -25,10 +25,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "character.h"
 #include "buffer.h"
 #include "syntax.h"
 #include "character.h"
 #include "buffer.h"
 #include "syntax.h"

-#include "window.h"

 #include "keyboard.h"
 #include "keymap.h"
 #include "keyboard.h"
 #include "keymap.h"

-#include "dispextern.h"

 #include "frame.h"
 
 static int internal_self_insert (int, EMACS_INT);
 #include "frame.h"
 
 static int internal_self_insert (int, EMACS_INT);


@@ -110,10 +108,17 @@ DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p",
 Precisely, if point is on line I, move to the start of line I + N
 \("start of line" in the logical order).
 If there isn't room, go as far as possible (no error).
 Precisely, if point is on line I, move to the start of line I + N
 \("start of line" in the logical order).
 If there isn't room, go as far as possible (no error).

+

 Returns the count of lines left to move.  If moving forward,
 Returns the count of lines left to move.  If moving forward,

-that is N - number of lines moved; if backward, N + number moved.
-With positive N, a non-empty line at the end counts as one line
-successfully moved (for the return value).  */)
+that is N minus number of lines moved; if backward, N plus number
+moved.
+
+Exception: With positive N, a non-empty line at the end of the
+buffer, or of its accessible portion, counts as one line
+successfully moved (for the return value).  This means that the
+function will move point to the end of such a line and will count
+it as a line moved across, even though there is no next line to
+go to its beginning.  */)

   (Lisp_Object n)
 {
   ptrdiff_t opoint = PT, pos, pos_byte, shortage, count;
   (Lisp_Object n)
 {
   ptrdiff_t opoint = PT, pos, pos_byte, shortage, count;


@@ -227,6 +232,9 @@ because it respects values of `delete-active-region' and `overwrite-mode'.  */)
 
   CHECK_NUMBER (n);
 
 
   CHECK_NUMBER (n);
 

+  if (eabs (XINT (n)) < 2)
+    call0 (Qundo_auto_amalgamate);
+

   pos = PT + XINT (n);
   if (NILP (killflag))
     {
   pos = PT + XINT (n);
   if (NILP (killflag))
     {


@@ -252,8 +260,6 @@ because it respects values of `delete-active-region' and `overwrite-mode'.  */)
   return Qnil;
 }
 
   return Qnil;
 }
 

-static int nonundocount;
-

 /* Note that there's code in command_loop_1 which typically avoids
    calling this.  */
 DEFUN ("self-insert-command", Fself_insert_command, Sself_insert_command, 1, 1, "p",
 /* Note that there's code in command_loop_1 which typically avoids
    calling this.  */
 DEFUN ("self-insert-command", Fself_insert_command, Sself_insert_command, 1, 1, "p",


@@ -267,34 +273,13 @@ After insertion, the value of `auto-fill-function' is called if the
 At the end, it runs `post-self-insert-hook'.  */)
   (Lisp_Object n)
 {
 At the end, it runs `post-self-insert-hook'.  */)
   (Lisp_Object n)
 {

-  bool remove_boundary = 1;

   CHECK_NUMBER (n);
 
   CHECK_NUMBER (n);
 

-  if (XFASTINT (n) < 0)
-    error ("Negative repetition argument %"pI"d", XFASTINT (n));
-
-  if (!EQ (Vthis_command, KVAR (current_kboard, Vlast_command)))
-    nonundocount = 0;
-
-  if (NILP (Vexecuting_kbd_macro)
-      && !EQ (minibuf_window, selected_window))
-    {
-      if (nonundocount <= 0 || nonundocount >= 20)
-       {
-         remove_boundary = 0;
-         nonundocount = 0;
-       }
-      nonundocount++;
-    }
+  if (XINT (n) < 0)
+    error ("Negative repetition argument %"pI"d", XINT (n));

 
 

-  if (remove_boundary
-      && CONSP (BVAR (current_buffer, undo_list))
-      && NILP (XCAR (BVAR (current_buffer, undo_list)))
-      /* Only remove auto-added boundaries, not boundaries
-        added be explicit calls to undo-boundary.  */
-      && EQ (BVAR (current_buffer, undo_list), last_undo_boundary))
-    /* Remove the undo_boundary that was just pushed.  */
-    bset_undo_list (current_buffer, XCDR (BVAR (current_buffer, undo_list)));
+  if (XFASTINT (n) < 2)
+    call0 (Qundo_auto_amalgamate);

 
   /* Barf if the key that invoked this was not a character.  */
   if (!CHARACTERP (last_command_event))
 
   /* Barf if the key that invoked this was not a character.  */
   if (!CHARACTERP (last_command_event))


@@ -304,7 +289,7 @@ At the end, it runs `post-self-insert-hook'.  */)
                                    XINT (last_command_event));
     int val = internal_self_insert (character, XFASTINT (n));
     if (val == 2)
                                    XINT (last_command_event));
     int val = internal_self_insert (character, XFASTINT (n));
     if (val == 2)

-      nonundocount = 0;
+      Fset (Qundo_auto__this_command_amalgamating, Qnil);

     frame_make_pointer_invisible (SELECTED_FRAME ());
   }
 
     frame_make_pointer_invisible (SELECTED_FRAME ());
   }
 


@@ -463,7 +448,7 @@ internal_self_insert (int c, EMACS_INT n)
        }
 
       replace_range (PT, PT + chars_to_delete, string, 1, 1, 1);
        }
 
       replace_range (PT, PT + chars_to_delete, string, 1, 1, 1);

-      Fforward_char (make_number (n + spaces_to_insert));
+      Fforward_char (make_number (n));

     }
   else if (n > 1)
     {
     }
   else if (n > 1)
     {


@@ -509,7 +494,10 @@ internal_self_insert (int c, EMACS_INT n)
 void
 syms_of_cmds (void)
 {
 void
 syms_of_cmds (void)
 {

-  DEFSYM (Qkill_backward_chars, "kill-backward-chars");
+  DEFSYM (Qundo_auto_amalgamate, "undo-auto-amalgamate");
+  DEFSYM (Qundo_auto__this_command_amalgamating,
+          "undo-auto--this-command-amalgamating");
+

   DEFSYM (Qkill_forward_chars, "kill-forward-chars");
 
   /* A possible value for a buffer's overwrite-mode variable.  */
   DEFSYM (Qkill_forward_chars, "kill-forward-chars");
 
   /* A possible value for a buffer's overwrite-mode variable.  */


@@ -539,7 +527,6 @@ keys_of_cmds (void)
 {
   int n;
 
 {
   int n;
 

-  nonundocount = 0;

   initial_define_key (global_map, Ctl ('I'), "self-insert-command");
   for (n = 040; n < 0177; n++)
     initial_define_key (global_map, n, "self-insert-command");
   initial_define_key (global_map, Ctl ('I'), "self-insert-command");
   for (n = 040; n < 0177; n++)
     initial_define_key (global_map, n, "self-insert-command");