Changeset 3553

Timestamp:

11/21/04 09:53:25 (4 years ago)

Author:

miyoshi

Message:

* abbrev.c: Sync up with Emacs CVS HEAD.

* acldef.h: Ditto.

* alloca.c: Ditto.

* atimer.c: Ditto.

* atimer.h: Ditto.

* blockinput.h: Ditto.

* buffer.c: Ditto.

* buffer.h: Ditto.

* bytecode.c: Ditto.

* editfns.c: Ditto.

* fileio.c: Ditto.

* lisp.h: Update declarations.

Files:

• branches/2.2/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.2/src/abbrev.c (modified) (13 diffs)
• branches/2.2/src/acldef.h (modified) (1 diff)
• branches/2.2/src/alloca.c (modified) (17 diffs)
• branches/2.2/src/atimer.c (modified) (7 diffs)
• branches/2.2/src/atimer.h (modified) (4 diffs)
• branches/2.2/src/blockinput.h (modified) (3 diffs)
• branches/2.2/src/buffer.c (modified) (133 diffs)
• branches/2.2/src/buffer.h (modified) (26 diffs)
• branches/2.2/src/bytecode.c (modified) (26 diffs)
• branches/2.2/src/editfns.c (modified) (1 diff)
• branches/2.2/src/fileio.c (modified) (1 diff)
• branches/2.2/src/lisp.h (modified) (1 diff)

branches/2.2/src/ChangeLog.Meadow

@@ +1 @@
+2004-11-21  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * abbrev.c: Sync up with Emacs CVS HEAD.
+
+        * acldef.h: Ditto.
+
+        * alloca.c: Ditto.
+
+        * atimer.c: Ditto.
+
+        * atimer.h: Ditto.
+
+        * blockinput.h: Ditto.
+
+        * buffer.c: Ditto.
+
+        * buffer.h: Ditto.
+
+        * bytecode.c: Ditto.
+
+        * editfns.c: Ditto.
+
+        * fileio.c: Ditto.
+
+        * lisp.h: Update declarations.
+
-2004-11-13  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.2/src/abbrev.c

@@ -1 +1 @@
-/* Primitives for word-abbrev mode.
-
+
+
-
-This file is part of GNU Emacs.
@@ -89 +90 @@
-     ()
-{
+  /* The value 59 is arbitrary chosen prime number.  */
-  return Fmake_vector (make_number (59), make_number (0));
-}
@@ -94 +96 @@
-DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0,
-       doc: /* Undefine all abbrevs in abbrev table TABLE, leaving it empty.  */)
-
+   
-     Lisp_Object table;
-{
@@ -203 +205 @@
-      if (!NILP (current_buffer->abbrev_table))
-        sym = Fintern_soft (abbrev, current_buffer->abbrev_table);
-XSYMBOL (sym)->value
+SYMBOL_VALUE (sym)
-        sym = Qnil;
-      if (NILP (sym))
-        sym = Fintern_soft (abbrev, Vglobal_abbrev_table);
-    }
-
+
+
-  return sym;
-}
@@ -246 +249 @@
-  value = Qnil;
-
-
-
+
-
-  wordstart = 0;
@@ -318 +320 @@
-  else
-    XSETFASTINT (sym, 0);
-
+
+
-    sym = oblookup (Vglobal_abbrev_table, buffer,
-                    wordend - wordstart, p - buffer);
-XSYMBOL (sym)->value
+SYMBOL_VALUE (sym)
-    return value;
-
@@ -343 +346 @@
-  if (INTEGERP (XSYMBOL (sym)->plist))
-    XSETINT (XSYMBOL (sym)->plist,
-
+
+
+
-
-  /* If this abbrev has an expansion, delete the abbrev
-     and insert the expansion.  */
-XSYMBOL (sym)->value
+SYMBOL_VALUE (sym)
-  if (STRINGP (expansion))
-    {
-      SET_PT (wordstart);
-
-
-
-
-
+
+
+
+
+
+
+
-      SET_PT (PT + whitecnt);
-
@@ -433 +441 @@
-      int zv_before;
-
-XSYMBOL (Vlast_abbrev)->value
+SYMBOL_VALUE (Vlast_abbrev)
-      if (!STRINGP (val))
-        error ("value of abbrev-symbol must be a string");
-      zv_before = ZV;
-TRING_BYTES (XSTRING (val)
+BYTES (val
-      /* Don't inherit properties here; just copy from old contents.  */
-      insert_from_string (Vlast_abbrev_text, 0, 0,
-XSTRING (Vlast_abbrev_text)->size
-TRING_BYTES (XSTRING (Vlast_abbrev_text)
+SCHARS (Vlast_abbrev_text)
+BYTES (Vlast_abbrev_text
-      Vlast_abbrev_text = Qnil;
-      /* Total number of characters deleted.  */
@@ -454 +462 @@
-     Lisp_Object sym, stream;
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return;
+
-  insert ("    (", 5);
-XSYMBOL (sym)->name
+SYMBOL_NAME (sym)
-  Fprin1 (name, stream);
-  insert (" ", 1);
-XSYMBOL (sym)->value
+SYMBOL_VALUE (sym)
-  insert (" ", 1);
-  Fprin1 (XSYMBOL (sym)->function, stream);
-  insert (" ", 1);
-XSYMBOL (sym)->plis
+coun
-  insert (")\n", 2);
-}
@@ -473 +494 @@
-     Lisp_Object sym, stream;
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return;
+
-  one = make_number (1);
-  Fprin1 (Fsymbol_name (sym), stream);
-
-
+
+
+
+
+
+
+
+
+
+
-  Findent_to (make_number (20), one);
-XSYMBOL (sym)->value
+SYMBOL_VALUE (sym)
-  if (!NILP (XSYMBOL (sym)->function))
-    {
@@ -498 +539 @@
-is inserted.  Otherwise the description is an expression,
-a call to `define-abbrev-table', which would
-
-
+
+
+
+
+
-     Lisp_Object name, readable;
-{
@@ -616 +660 @@
-  DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location,
-               doc: /* Buffer position for `expand-abbrev' to use as the start of the abbrev.
-nil means
+When nil,
-Calling `expand-abbrev' sets this to nil.  */);
-  Vabbrev_start_location = Qnil;
@@ -657 +701 @@
-  defsubr (&Sdefine_abbrev_table);
-}
+
+/* arch-tag: b721db69-f633-44a8-a361-c275acbdad7d
+   (do not change this comment) */

branches/2.2/src/acldef.h

@@ -39 +39 @@
-#define ACL$B_TYPE      10
-#define ACL$L_LIST      12
+
+/* arch-tag: 7c11e99d-34df-41e8-98e2-20f152c4ad73
+   (do not change this comment) */

branches/2.2/src/alloca.c

@@ -1 +1 @@
-/* alloca.c -- allocate automatically reclaimed memory
-   (Mostly) portable public-domain implementation -- D A Gwyn
+
+   NOTE: The canonical source of this file is maintained with gnulib.
+   Bugs can be reported to bug-gnulib@gnu.org.
-
-   This implementation of the PWB library alloca function,
@@ -23 +26 @@
-
-#ifdef HAVE_CONFIG_H
-
+ 
-#endif
-
-#ifdef HAVE_STRING_H
-
+ 
-#endif
-#ifdef HAVE_STDLIB_H
-
+ 
-#endif
-
-
-
-
+
+
-#endif
-
@@ -43 +45 @@
-/* If someone has defined alloca as a macro,
-   there must be some other way alloca is supposed to work.  */
-
-
-
-
+ 
+
+  
+   
-/* actually, only want this if static is defined as ""
-   -- this is for usg, in which emacs must undefine static
-   in order to make unexec workable
-   */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* If your stack is a linked list of frames, you have to
-   provide an "address metric" ADDRESS_FUNCTION macro.  */
-
-
+  
-long i00afunc ();
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-typedef POINTER_TYPE *pointer;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-   Callers below should use malloc.  */
-
-ifdef emacs
-
-ifdef EMACS_FREE
-define free EMACS_FREE
-
-
-extern pointer malloc (
+  undef malloc
+  
+  undef free
+  define free xfree
+
+
+void xfree _P ((void *)
-
-/* Define STACK_DIRECTION if you know the direction of stack
@@ -108 +111 @@
-   STACK_DIRECTION = 0 => direction of growth unknown  */
-
-
-define        
-
-
-
-
-define        
-
-
+  
+   define 
+  
+
+  
+
+   define 
+
+  
-
-static int stack_dir;           /* 1 or -1 once known.  */
-define        
+   define 
-
-static void
@@ -143 +146 @@
-}
-
-
+  
-
-/* An "alloca header" is used to:
@@ -152 +155 @@
-   alignment chunk size.  The following default should work okay.  */
-
-
-define        
-
+  
+   define 
+  
-
-typedef union hdr
@@ -177 +180 @@
-pointer
-alloca (size)
-unsigned
+size_t
-{
-  auto char probe;              /* Probes stack depth: */
-  register char *depth = ADDRESS_FUNCTION (probe);
-
-
+  
-  if (STACK_DIR == 0)           /* Unknown growth direction.  */
-    find_stack_direction ();
-
+  
-
-  /* Reclaim garbage, defined as all alloca'd storage that
@@ -193 +196 @@
-    register header *hp;        /* Traverses linked list.  */
-
-ifdef emacs
+  ifdef DO_BLOCK_INPUT
-    BLOCK_INPUT;
-
+  
-
-    for (hp = last_alloca_header; hp != NULL;)
@@ -212 +215 @@
-    last_alloca_header = hp;    /* -> last valid storage.  */
-
-ifdef emacs
+  ifdef DO_BLOCK_INPUT
-    UNBLOCK_INPUT;
-
+  
-  }
-
@@ -223 +226 @@
-
-  {
+    /* Address of header.  */
-    register pointer new = malloc (sizeof (header) + size);
-    /* Address of header.  */
-
-    if (new == 0)
@@ -240 +243 @@
-}
-
-
-
-
-
-
-
-
-
-
+  
+
+   
+    
+   
+
+   
+    
+    
-/* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */
-struct stack_control_header
@@ -300 +303 @@
-  };
-
-
+    
-/* The following structure defines the vector of words
-   returned by the STKSTAT library routine.  */
@@ -353 +356 @@
-  };
-
-
-
-
-
+    
+   
+
+   
-/* Determine a "stack measure" for an arbitrary ADDRESS.
-   I doubt that "lint" will like this much.  */
@@ -427 +430 @@
-}
-
-
+   
-/* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP.
-   Determine the number of the cell within the stack,
@@ -472 +475 @@
-  while (!(this_segment <= address && address <= stkl))
-    {
-
+    
-      fprintf (stderr, "%011o %011o %011o\n", this_segment, address, stkl);
-
+    
-      if (pseg == 0)
-        break;
@@ -493 +496 @@
-  while (pseg != 0)
-    {
-
+    
-      fprintf (stderr, "%011o %011o\n", pseg, size);
-
+    
-      stkl = stkl - pseg;
-      ssptr = (struct stack_segment_linkage *) stkl;
@@ -505 +508 @@
-}
-
-
-
-
-
+   
+  
+
+ 
-#endif /* not GCC version 2 */
+
+/* arch-tag: 5c9901c8-3cd4-453e-bd66-d9035a175ee3
+   (do not change this comment) */

branches/2.2/src/atimer.c

@@ -1 +1 @@
-/* Asynchronous timers.
-
+, 2004
-
-This file is part of GNU Emacs.
@@ -20 +20 @@
-
-#include <config.h>
+#include <signal.h>
+#include <stdio.h>
-#include <lisp.h>
-#include <signal.h>
-#include <syssignal.h>
-#include <systime.h>
-#include <blockinput.h>
-#include <atimer.h>
-#include <stdio.h>
-
-#ifdef HAVE_UNISTD_H
@@ -35 +35 @@
-#include <sys/time.h>
-#endif
-
-/* The ubiquitous min/max macros.  */
-
-#define max(X, Y) ((X) > (Y) ? (X) : (Y))
-#define min(X, Y) ((X) < (Y) ? (X) : (Y))
-
-/* Free-list of atimer structures.  */
@@ -63 +58 @@
-int pending_atimers;
-
-.
+ 
-
-#define BLOCK_ATIMERS   sigblock (sigmask (SIGALRM))
@@ -381 +376 @@
-      t = atimers;
-      atimers = atimers->next;
+#ifndef MAC_OSX
-      t->fn (t);
+#endif
-
-      if (t->type == ATIMER_CONTINUOUS)
@@ -393 +390 @@
-          free_atimers = t;
-        }
+#ifdef MAC_OSX
+      /* Fix for Ctrl-G.  Perhaps this should apply to all platforms. */
+      t->fn (t); 
+#endif
-
-      EMACS_GET_TIME (now);
-    }
-
-#if defined (USG) && !defined (POSIX_SIGNALS)
-  /* USG systems forget handlers when they are used;
-     must reestablish each time.  */
-  signal (SIGALRM, alarm_signal_handler);
-#endif /* USG */
-
-  set_alarm ();
@@ -445 +440 @@
-  signal (SIGALRM, alarm_signal_handler);
-}
+/* arch-tag: e6308261-eec6-404b-89fb-6e5909518d70
+   (do not change this comment) */

branches/2.2/src/atimer.h

@@ -1 +1 @@
-/* Asynchronous timers.
-
+, 2003
-
-This file is part of GNU Emacs.
@@ -21 +21 @@
-#ifndef EMACS_ATIMER_H
-#define EMACS_ATIMER_H
+
+/* Declare the prototype for a general external function.  */
+#if defined (PROTOTYPES) || defined (WINDOWSNT)
+#define P_(proto) proto
+#else
+#define P_(proto) ()
+#endif
-
-#include "systime.h"            /* for EMACS_TIME */
@@ -59 +66 @@
-  EMACS_TIME interval;
-
-
-
+r
+u
-  atimer_callback fn;
-
@@ -83 +90 @@
-
-#endif /* EMACS_ATIMER_H */
+
+/* arch-tag: 02c7c1c8-45bd-4222-b874-4ca44662f60b
+   (do not change this comment) */

branches/2.2/src/blockinput.h

@@ -1 +1 @@
-/* blockinput.h - interface to blocking complicated interrupt-driven input.
-
+, 2004
-
-This file is part of GNU Emacs.
@@ -98 +98 @@
-#define UNBLOCK_INPUT_RESIGNAL UNBLOCK_INPUT
-
+/* In critical section ? */
+#define INPUT_BLOCKED_P (interrupt_input_blocked > 0)
+
-/* Defined in keyboard.c */
-/* Don't use a prototype here; it causes trouble in some files.  */
@@ -116 +119 @@
-
-#endif /* EMACS_BLOCKINPUT_H */
+
+/* arch-tag: 51a9ec86-945a-4966-8f04-2d1341250e03
+   (do not change this comment) */

branches/2.2/src/buffer.c

@@ -33 +33 @@
-
-#ifndef MAXPATHLEN
-
+ [probably SunOS? -stef] 
-#define MAXPATHLEN 1024
-#endif /* not MAXPATHLEN */
@@ -40 +40 @@
-#include <unistd.h>
-#endif
+
-#include "lisp.h"
-#include "intervals.h"
@@ -50 +51 @@
-#include "blockinput.h"
-#include "keyboard.h"
+#include "keymap.h"
-#include "frame.h"
-
@@ -87 +89 @@
-   If a slot is -2, then there is no DEFVAR_PER_BUFFER for it,
-   but there is a default value which is copied into each buffer.
-
-   If a slot in this structure is negative, then even though there may
-   be a DEFVAR_PER_BUFFER for the slot, there is no default value for it;
-   and the corresponding slot in buffer_defaults is not used.
-
-   If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is
@@ -149 +147 @@
-   If any of these functions returns nil, we don't kill it.  */
-Lisp_Object Vkill_buffer_query_functions;
+Lisp_Object Qkill_buffer_query_functions;
-
-/* List of functions to call before changing an unmodified buffer.  */
@@ -156 +155 @@
-Lisp_Object Qbefore_change_functions;
-Lisp_Object Qafter_change_functions;
+Lisp_Object Qucs_set_table_for_input;
-
-/* If nonzero, all modification hooks are suppressed.  */
@@ -192 +192 @@
-{
-  if (STRINGP (spec))
-XSTRING (spec)->data
+SDATA (spec)
-  error ("Invalid buffer argument");
-}
@@ -199 +199 @@
-       doc: /* Return non-nil if OBJECT is a buffer which has not been killed.
-Value is nil if OBJECT is not a buffer or if it has been killed.  */)
-
+   
-     Lisp_Object object;
-{
@@ -208 +208 @@
-DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 1, 0,
-       doc: /* Return a list of all existing live buffers.
-
-
+
+
+
+
-     Lisp_Object frame;
-{
@@ -246 +248 @@
-{
-  register Lisp_Object tail;
-!NILP (tail); tail = Fcdr
+CONSP (tail); tail = XCDR
-    {
-      register Lisp_Object elt, tem;
-Fcar
+XCAR
-      tem = Fstring_equal (Fcar (elt), key);
-      if (!NILP (tem))
@@ -261 +263 @@
-If there is no live buffer named NAME, return nil.
-NAME may also be a buffer; if so, the value is that buffer.  */)
-
+   
-     register Lisp_Object name;
-{
@@ -276 +278 @@
-If there is no such live buffer, return nil.
-See also `find-buffer-visiting'.  */)
-
+   
-     register Lisp_Object filename;
-{
@@ -330 +332 @@
-If NAME is a buffer instead of a string, then it is the value returned.
-The value is never nil.  */)
-
+   
-     register Lisp_Object name;
-{
@@ -340 +342 @@
-    return buf;
-
-XSTRING (name)->size
+SCHARS (name)
-    error ("Empty string for buffer name is not allowed");
-
@@ -360 +362 @@
-    buffer_memory_full ();
-
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
+BEG
+BEG
+BEG
+BEG
+BEG
+BEG_BYTE
+BEG_BYTE
+BEG_BYTE
+BEG_BYTE
+BEG_BYTE
-  BUF_MODIFF (b) = 1;
-  BUF_OVERLAY_MODIFF (b) = 1;
@@ -396 +398 @@
-
-  name = Fcopy_sequence (name);
-XSTRING (name)->intervals = NULL_INTERVAL
+STRING_SET_INTERVALS (name, NULL_INTERVAL)
-  b->name = name;
-
-XSTRING (name)->data[0]
+SREF (name, 0)
-    b->undo_list = Qnil;
-  else
@@ -407 +409 @@
-  reset_buffer_local_variables (b, 1);
-
+  b->mark = Fmake_marker ();
+  BUF_MARKERS (b) = Qnil;
+  b->name = name;
+
-  /* Put this in the alist of all live buffers.  */
-  XSETBUFFER (buf, b);
-  Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil));
-
-  b->mark = Fmake_marker ();
-  BUF_MARKERS (b) = Qnil;
-  b->name = name;
-  return buf;
-}
@@ -433 +436 @@
-    {
-      Lisp_Object overlay, start, end, old_overlay;
-int
+EMACS_INT
-
-      old_overlay = XCAR (list);
@@ -472 +475 @@
-     struct buffer *from, *to;
-{
-
+, tem
-  int offset;
-
@@ -499 +502 @@
-  to->overlays_before = copy_overlays (to, from->overlays_before);
-  to->overlays_after = copy_overlays (to, from->overlays_after);
+
+  /* Copy the alist of local variables,
+     and all the alist elements too.  */
+  to->local_var_alist
+    = Fcopy_sequence (from->local_var_alist);
+  for (tem = to->local_var_alist; CONSP (tem);
+       tem = XCDR (tem))
+    XSETCAR (tem, Fcons (XCAR (XCAR (tem)), XCDR (XCAR (tem))));
-}
-
@@ -506 +517 @@
-       "bMake indirect buffer (to buffer): \nBName of indirect buffer: ",
-       doc: /* Create and return an indirect buffer for buffer BASE-BUFFER, named NAME.
-n existing buffer (or buffer name)
+ live buffer, or the name of an existing buffer
-NAME should be a string which is not the name of an existing buffer.
-Optional argument CLONE non-nil means preserve BASE-BUFFER's state,
-such as major and minor modes, in the indirect buffer.
-CLONE nil means the indirect buffer's state is reset to default values.  */)
-
+   
-     Lisp_Object base_buffer, name, clone;
-{
-
+, tem
-  struct buffer *b;
-
+  CHECK_STRING (name);
-  buf = Fget_buffer (name);
-  if (!NILP (buf))
-
-
+
+
+
-  base_buffer = Fget_buffer (base_buffer);
-  if (NILP (base_buffer))
-
-
-
+
+
+
+
+
-    error ("Empty string for buffer name is not allowed");
-
@@ -555 +570 @@
-
-  name = Fcopy_sequence (name);
-XSTRING (name)->intervals = NULL_INTERVAL
+STRING_SET_INTERVALS (name, NULL_INTERVAL)
-  b->name = name;
-
@@ -633 +648 @@
-
-/* Reinitialize everything about a buffer except its name and contents
-
+
+
+
+
+
-
-void
@@ -712 +731 @@
-#endif
-
-#if 0
-  b->sort_table = XSTRING (Vascii_sort_table);
-  b->folding_sort_table = XSTRING (Vascii_folding_sort_table);
-#endif /* 0 */
-
-  /* Reset all (or most) per-buffer variables to their defaults.  */
-  b->local_var_alist = Qnil;
@@ -749 +763 @@
-If there is no live buffer named NAME, then return NAME.
-Otherwise modify name by appending `<NUMBER>', incrementing NUMBER
-
+\(starting at 2) 
-Optional second argument IGNORE specifies a name that is okay to use
-\(if it is in the sequence to be tried)
-even if a buffer with that name exists.  */)
-
+    
-     register Lisp_Object name, ignore;
-{
@@ -762 +776 @@
-  CHECK_STRING (name);
-
+  tem = Fstring_equal (name, ignore);
+  if (!NILP (tem))
+    return name;
-  tem = Fget_buffer (name);
-  if (NILP (tem))
@@ -784 +801 @@
-       doc: /* Return the name of BUFFER, as a string.
-With no argument or nil as argument, return the name of the current buffer.  */)
-
+   
-     register Lisp_Object buffer;
-{
@@ -796 +813 @@
-       doc: /* Return name of file BUFFER is visiting, or nil if none.
-No argument or nil as argument means use the current buffer.  */)
-
+   
-     register Lisp_Object buffer;
-{
@@ -808 +825 @@
-       0, 1, 0,
-       doc: /* Return the base buffer of indirect buffer BUFFER.
-
-
+
+
+
-     register Lisp_Object buffer;
-{
@@ -878 +896 @@
-
-      /* What binding is loaded right now?  */
-XSYMBOL (symbol)->value
+SYMBOL_VALUE (symbol)
-      current_alist_element
-        = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
@@ -907 +925 @@
-Note that storing new VALUEs in these elements doesn't change the variables.
-No argument or nil as argument means use current buffer as BUFFER.  */)
-
+   
-     register Lisp_Object buffer;
-{
@@ -976 +994 @@
-       doc: /* Return t if BUFFER was modified since its file was last read or saved.
-No argument or nil as argument means use current buffer as BUFFER.  */)
-
+   
-     register Lisp_Object buffer;
-{
@@ -995 +1013 @@
-       doc: /* Mark current buffer as modified or unmodified according to FLAG.
-A non-nil FLAG means mark the buffer modified.  */)
-
+   
-     register Lisp_Object flag;
-{
@@ -1044 +1062 @@
-DEFUN ("restore-buffer-modified-p", Frestore_buffer_modified_p,
-       Srestore_buffer_modified_p, 1, 1, 0,
-s
+
-It is not ensured that mode lines will be updated to show the modified
-state of the current buffer.  Use with care.  */)
-
+   
-     Lisp_Object flag;
-{
@@ -1078 +1096 @@
-that buffer is changed.  It wraps around occasionally.
-No argument or nil as argument means use current buffer as BUFFER.  */)
-
+   
-     register Lisp_Object buffer;
-{
@@ -1103 +1121 @@
-We return the name we actually gave the buffer.
-This does not change the name of the visited file (if any).  */)
-
+   
-&n