Merge from emacs-24; up to 2012-05-02T07:12:52Z!rgm@gnu.org.

This commit is contained in:
Chong Yidong 2012-08-07 11:33:37 +08:00
commit 9f6f48455f
11 changed files with 53 additions and 25 deletions

View file

@ -1,3 +1,7 @@
2012-07-31 Chong Yidong <cyd@gnu.org>
* emacs.texi: Fix ISBN (Bug#12080).
2012-08-05 Chong Yidong <cyd@gnu.org>
* display.texi (Faces): Document frame-background-mode (Bug#7774).

View file

@ -94,7 +94,7 @@ developing GNU and promoting software freedom.''
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.

View file

@ -1,3 +1,11 @@
2012-08-06 Eli Zaretskii <eliz@gnu.org>
* 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 <cyd@gnu.org>
* display.texi (Defining Faces): Move documentation of

View file

@ -1100,8 +1100,9 @@ named function that you create (e.g.@: with @code{defun}), as well as
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.
@dfn{closure}.
@cindex 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

View file

@ -967,11 +967,11 @@ wants the current value of a variable, it looks first in the lexical
environment; if the variable is not specified in there, it looks in
the symbol's value cell, where the dynamic value is stored.
@cindex closures
@cindex 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

View file

@ -1,3 +1,8 @@
2012-08-06 Aurélien Aptel <aurelien.aptel@gmail.com>
* url.texi (Parsed URLs): Adjust to the code's use of defstruct
(bug#12096).
2012-08-01 Jay Belanger <jay.p.belanger@gmail.com>
* calc.texi (Simplification modes, Conversions)

View file

@ -126,10 +126,10 @@ directory in @code{user-emacs-directory}, which is normally
@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
[@var{type} @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 user password associated with it, or @code{nil};
is the host name associated with it, or @code{nil};
@item port
is the port number associated with it, or @code{nil};
@item file
@item 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};
@item full
@item fullness
is @code{t} for a fully-specified URL, with a host part indicated by
@samp{//} after the scheme part.
@item 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 @@ is @code{t} for a fully-specified URL, with a host part indicated by
@findex url-password
@findex url-host
@findex url-port
@findex url-file
@findex url-filename
@findex url-target
@findex url-attributes
@findex url-full
@findex url-set-type
@findex url-set-user
@findex url-set-password
@findex url-set-host
@findex url-set-port
@findex url-set-file
@findex url-set-target
@findex url-set-attributes
@findex url-set-full
@findex url-fullness
These attributes have accessors named @code{url-@var{part}}, where
@var{part} is the name of one of the elements above, e.g.,
@code{url-host}. Similarly, there are setters of the form
@code{url-set-@var{part}}.
@code{url-host}. These attributes can be set with the same accessors
using @code{setf}:
@example
(setf (url-port url) 80)
@end 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.

View file

@ -1179,7 +1179,7 @@ buffer was used.
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.

View file

@ -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

View file

@ -1,3 +1,8 @@
2012-08-06 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/cperl-mode.el (cperl-mode): Yet another fix for
syntax-propertize-function (bug#10095).
2012-08-06 Stefan Monnier <monnier@iro.umontreal.ca>
* help-fns.el (help-fns--key-bindings, help-fns--signature)

View file

@ -1838,7 +1838,13 @@ or as help on variables `cperl-tips', `cperl-problems',
(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)