[Emacs-diffs] /srv/bzr/emacs/trunk r109481: Merge from emacs-24; up to r108090.

[Chong Yidong]

------------------------------------------------------------
revno: 109481 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-07 11:33:37 +0800
message:
  Merge from emacs-24; up to r108090.
modified:
  doc/emacs/ChangeLog
  doc/emacs/emacs.texi
  doc/lispref/ChangeLog
  doc/lispref/functions.texi
  doc/lispref/variables.texi
  doc/misc/ChangeLog
  doc/misc/url.texi
  etc/NEWS
  leim/quail/persian.el
  lisp/ChangeLog
  lisp/progmodes/cperl-mode.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-08-05 09:24:55 +0000
+++ b/doc/emacs/ChangeLog       2012-08-07 03:31:53 +0000
@@ -1,3 +1,7 @@
+2012-07-31  Chong Yidong  <address@hidden>
+
+       * emacs.texi: Fix ISBN (Bug#12080).
+
 2012-08-05  Chong Yidong  <address@hidden>
 
        * display.texi (Faces): Document frame-background-mode (Bug#7774).

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2012-07-21 06:13:23 +0000
+++ b/doc/emacs/emacs.texi      2012-08-07 03:31:53 +0000
@@ -94,7 +94,7 @@
 Published by the Free Software Foundation @*
 51 Franklin Street, Fifth Floor @*
 Boston, MA 02110-1301 USA @*
-ISBN 978-0-9831592-3-0
+ISBN 978-0-9831592-4-7
 
 @sp 2
 Cover art by Etienne Suvasa; cover design by Matt Lee.

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-08-05 09:24:55 +0000
+++ b/doc/lispref/ChangeLog     2012-08-07 03:31:53 +0000
@@ -1,3 +1,11 @@
+2012-08-06  Eli Zaretskii  <address@hidden>
+
+       * functions.texi (Closures): Put the main index entry for
+       "closures" here.  (Bug#12138)
+
+       * variables.texi (Lexical Binding): Disambiguate the index entry
+       for "closures".
+
 2012-08-05  Chong Yidong  <address@hidden>
 
        * display.texi (Defining Faces): Move documentation of

=== modified file 'doc/lispref/functions.texi'
--- a/doc/lispref/functions.texi        2012-06-18 15:57:41 +0000
+++ b/doc/lispref/functions.texi        2012-08-07 03:33:37 +0000
@@ -1100,8 +1100,9 @@
 any anonymous function that you create using the @code{lambda} macro
 or the @code{function} special form or the @code{#'} syntax
 (@pxref{Anonymous Functions}), is automatically converted into a
-closure.
address@hidden
 
address@hidden closure
   A closure is a function that also carries a record of the lexical
 environment that existed when the function was defined.  When it is
 invoked, any lexical variable references within its definition use the

=== modified file 'doc/lispref/variables.texi'
--- a/doc/lispref/variables.texi        2012-05-27 01:34:14 +0000
+++ b/doc/lispref/variables.texi        2012-08-07 03:31:53 +0000
@@ -967,11 +967,11 @@
 environment; if the variable is not specified in there, it looks in
 the symbol's value cell, where the dynamic value is stored.
 
address@hidden closures
address@hidden closures, example of using
   Lexical bindings have indefinite extent.  Even after a binding
 construct has finished executing, its lexical environment can be
 ``kept around'' in Lisp objects called @dfn{closures}.  A closure is
-created when you create a named or anonymous function with lexical
+created when you define a named or anonymous function with lexical
 binding enabled.  @xref{Closures}, for details.
 
   When a closure is called as a function, any lexical variable

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-08-01 23:42:29 +0000
+++ b/doc/misc/ChangeLog        2012-08-07 03:31:53 +0000
@@ -1,3 +1,8 @@
+2012-08-06  Aurélien Aptel  <address@hidden>
+
+       * url.texi (Parsed URLs): Adjust to the code's use of defstruct
+       (bug#12096).
+
 2012-08-01  Jay Belanger  <address@hidden>
 
        * calc.texi (Simplification modes, Conversions)

=== modified file 'doc/misc/url.texi'
--- a/doc/misc/url.texi 2012-02-29 08:12:51 +0000
+++ b/doc/misc/url.texi 2012-08-06 21:50:25 +0000
@@ -126,10 +126,10 @@
 @section Parsed URLs
 @cindex parsed URLs
 The library functions typically operate on @dfn{parsed} versions of
-URLs.  These are actually vectors of the form:
+URLs.  These are actually CL structures (vectors) of the form:
 
 @example
address@hidden @var{user} @var{password} @var{host} @var{port} @var{file} 
@var{target} @var{attributes} @var{full}]
+[cl-struct-url @var{type} @var{user} @var{password} @var{host} @var{port} 
@var{filename} @var{target} @var{attributes} @var{fullness} @var{use-cookies}]
 @end example
 
 @noindent where
@@ -144,16 +144,19 @@
 is the host name associated with it, or @code{nil};
 @item port
 is the port number associated with it, or @code{nil};
address@hidden file
address@hidden filename
 is the ``file'' part of it, or @code{nil}.  This doesn't necessarily
 actually refer to a file;
 @item target
 is the target part, or @code{nil};
 @item attributes
 is the attributes associated with it, or @code{nil};
address@hidden full
address@hidden fullness
 is @code{t} for a fully-specified URL, with a host part indicated by
 @samp{//} after the scheme part.
address@hidden use-cookies
+is @code{nil} to neither send or store cookies to the server, @code{t}
+otherwise.
 @end table
 
 @findex url-type
@@ -161,23 +164,21 @@
 @findex url-password
 @findex url-host
 @findex url-port
address@hidden url-file
address@hidden url-filename
 @findex url-target
 @findex url-attributes
address@hidden url-full
address@hidden url-set-type
address@hidden url-set-user
address@hidden url-set-password
address@hidden url-set-host
address@hidden url-set-port
address@hidden url-set-file
address@hidden url-set-target
address@hidden url-set-attributes
address@hidden url-set-full
address@hidden url-fullness
 These attributes have accessors named @address@hidden, where
 @var{part} is the name of one of the elements above, e.g.,
address@hidden  Similarly, there are setters of the form
address@hidden@var{part}}.
address@hidden  These attributes can be set with the same accessors
+using @code{setf}:
+
address@hidden
+(setf (url-port url) 80)
address@hidden example
+
+If @var{port} is @var{nil}, @code{url-port} returns the default port
+of the protocol.
 
 There are functions for parsing and unparsing between the string and
 vector forms.

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-08-06 07:36:35 +0000
+++ b/etc/NEWS  2012-08-07 03:31:53 +0000
@@ -1179,7 +1179,7 @@
 The search is performed using `customize-apropos'.
 To turn off the search field, set `custom-search-field' to nil.
 
-*** Custom options now start out hidden if at their default values.
+*** Options in customize group buffers start out hidden if not customized.
 Use the arrow to the left of the option name to toggle visibility.
 
 *** custom-buffer-sort-alphabetically now defaults to t.

=== modified file 'leim/quail/persian.el'
--- a/leim/quail/persian.el     2012-08-06 07:34:35 +0000
+++ b/leim/quail/persian.el     2012-08-07 03:31:53 +0000
@@ -22,8 +22,6 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;; This is a Halaal Poly-Existential intended to remain perpetually Halaal.
-
 ;;; Commentary:
 ;;
 ;; This file contains a collection of input methods for

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-06 21:05:48 +0000
+++ b/lisp/ChangeLog    2012-08-07 03:31:53 +0000
@@ -1,5 +1,10 @@
 2012-08-06  Stefan Monnier  <address@hidden>
 
+       * progmodes/cperl-mode.el (cperl-mode): Yet another fix for
+       syntax-propertize-function (bug#10095).
+
+2012-08-06  Stefan Monnier  <address@hidden>
+
        * help-fns.el (help-fns--key-bindings, help-fns--signature)
        (help-fns--parent-mode, help-fns--obsolete): New funs, extracted from
        describe-function-1.

=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el      2012-07-21 06:13:23 +0000
+++ b/lisp/progmodes/cperl-mode.el      2012-08-07 03:31:53 +0000
@@ -1838,7 +1838,13 @@
             (set (make-local-variable 'cperl-syntax-done-to) nil)
             (set (make-local-variable 'syntax-propertize-function)
                  (lambda (start end)
-                   (goto-char start) (cperl-fontify-syntaxically end))))
+                   (goto-char start)
+                   ;; Even if cperl-fontify-syntaxically has already gone
+                   ;; beyond `start', syntax-propertize has just removed
+                   ;; syntax-table properties between start and end, so we have
+                   ;; to re-apply them.
+                   (setq cperl-syntax-done-to start)
+                   (cperl-fontify-syntaxically end))))
        (make-local-variable 'parse-sexp-lookup-properties)
        ;; Do not introduce variable if not needed, we check it!
        (set 'parse-sexp-lookup-properties t)