[Emacs-diffs] /srv/bzr/emacs/trunk r111923: Merge from emacs-24; up to r111314

[Glenn Morris]

------------------------------------------------------------
revno: 111923 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-02 18:39:57 -0800
message:
  Merge from emacs-24; up to r111314
modified:
  doc/lispintro/ChangeLog
  doc/lispintro/emacs-lisp-intro.texi
  doc/lispref/ChangeLog
  doc/lispref/objects.texi

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2013-01-02 16:13:04 +0000
+++ b/doc/lispintro/ChangeLog   2013-03-03 02:39:57 +0000
@@ -1,3 +1,8 @@
+2013-03-03  Glenn Morris  <address@hidden>
+
+       * emacs-lisp-intro.texi (Digression into C): Update example.
+       (defcustom): Fix typo.
+
 2012-12-22  Glenn Morris  <address@hidden>
 
        * Makefile.in (srcs): New variable, adding doclicense.texi.

=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi       2013-02-22 17:13:05 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi       2013-03-03 02:39:57 +0000
@@ -9116,8 +9116,8 @@
 system.  Since it is very simple, I will digress briefly from Lisp and
 describe it here.
 
address@hidden GNU Emacs 22  in /usr/local/src/emacs/src/editfns.c
address@hidden the DEFUN for  buffer-substring-no-properties
address@hidden GNU Emacs 24  in src/editfns.c
address@hidden the DEFUN for  delete-and-extract-region
 
 @need 1500
 Like many of the other Emacs primitives,
@@ -9127,22 +9127,15 @@
 
 @smallexample
 @group
-DEFUN ("buffer-substring-no-properties", Fbuffer_substring_no_properties,
-       Sbuffer_substring_no_properties, 2, 2, 0,
-       doc: /* Return the characters of part of the buffer,
-without the text properties.
-The two arguments START and END are character positions;
-they can be in either order.  */)
-     (start, end)
-     Lisp_Object start, end;
+DEFUN ("delete-and-extract-region", Fdelete_and_extract_region,
+       Sdelete_and_extract_region, 2, 2, 0,
+       doc: /* Delete the text between START and END and return it.  */)
+       (Lisp_Object start, Lisp_Object end)
 @{
-  register int b, e;
-
   validate_region (&start, &end);
-  b = XINT (start);
-  e = XINT (end);
-
-  return make_buffer_string (b, e, 0);
+  if (XINT (start) == XINT (end))
+    return empty_unibyte_string;
+  return del_range_1 (XINT (start), XINT (end), 1, 1);
 @}
 @end group
 @end smallexample
@@ -9192,20 +9185,9 @@
 
 @item
 The seventh part is a documentation string, just like the one for a
-function written in Emacs Lisp, except that every newline must be
-written explicitly as @samp{\n} followed by a backslash and carriage
-return.
-
address@hidden 1000
-Thus, the first two lines of documentation for  @code{goto-char} are
-written like this:
-
address@hidden
address@hidden
-  "Set point to POSITION, a number or marker.\n\
-Beginning of buffer is position (point-min), end is (point-max)."
address@hidden group
address@hidden smallexample
+function written in Emacs Lisp.  This is written as a C comment.  (When
+you build Emacs, the program @command{lib-src/make-docfile} extracts
+these comments and uses them to make the ``real'' documentation.)
 @end itemize
 
 @need 1200
@@ -9218,15 +9200,15 @@
 @group
 validate_region (&start, &end);
 if (XINT (start) == XINT (end))
-  return build_string ("");
+  return empty_unibyte_string;
 return del_range_1 (XINT (start), XINT (end), 1, 1);
 @end group
 @end smallexample
 
-The   @code{validate_region} function checks whether the values
+The @code{validate_region} function checks whether the values
 passed as the beginning and end of the region are the proper type and
 are within range.  If the beginning and end positions are the same,
-then return and empty string.
+then return an empty string.
 
 The @code{del_range_1} function actually deletes the text.  It is a
 complex function we will not look into.  It updates the buffer and
@@ -17010,7 +16992,7 @@
   "Normal hook run when entering Text mode and many related modes."
   :type 'hook
   :options '(turn-on-auto-fill flyspell-mode)
-  :group 'data)
+  :group 'wp)
 @end group
 @end smallexample
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-02-28 06:30:48 +0000
+++ b/doc/lispref/ChangeLog     2013-03-03 02:39:57 +0000
@@ -1,3 +1,7 @@
+2013-03-03  Glenn Morris  <address@hidden>
+
+       * objects.texi (Symbol Type): Fix typo.
+
 2013-02-28  Bastien Guerry  <address@hidden>
 
        * variables.texi (File Local Variables): Fix reference.

=== modified file 'doc/lispref/objects.texi'
--- a/doc/lispref/objects.texi  2013-02-13 02:25:02 +0000
+++ b/doc/lispref/objects.texi  2013-03-03 02:09:31 +0000
@@ -565,8 +565,8 @@
 @end quotation
 
   Here are several examples of symbol names.  Note that the @samp{+} in
-the fifth example is escaped to prevent it from being read as a number.
-This is not necessary in the fourth example because the rest of the name
+the fourth example is escaped to prevent it from being read as a number.
+This is not necessary in the sixth example because the rest of the name
 makes it invalid as a number.
 
 @example