From 0c51ff6dcc0ec3facb9d7c73836bba0349ebdc62 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 31 Jul 2012 11:53:10 +0800 Subject: [PATCH 1/9] * emacs.texi: Fix ISBN. Fixes: debbugs:12080 --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/emacs.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b5038ae0948..1253a7cec61 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-07-31 Chong Yidong + + * emacs.texi: Fix ISBN (Bug#12080). + 2012-07-21 Eli Zaretskii * frames.texi (Mouse Commands): Fix the description of mouse-2. diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 1e34cdfd2b9..fdfb5a1db9a 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -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. From 8d5dd3701caf1dac63e92ab04c1ca3d79cfcb18c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 4 Aug 2012 21:56:28 -0700 Subject: [PATCH 2/9] NEWS clarification Fixes: debbugs:12104 --- etc/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index 4fbed3402af..4379f0c180b 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -582,7 +582,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. From a08eadfecc8651d6da2cdcb326d333545cb5f7c1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 6 Aug 2012 19:55:41 +0300 Subject: [PATCH 3/9] Fix bug #12138 with indexing "closures". doc/lispref/functions.texi (Closures): Put the main index entry for "closures" here. doc/lispref/variables.texi (Lexical Binding): Disambiguate the index entry for "closures". --- doc/lispref/ChangeLog | 8 ++++++++ doc/lispref/functions.texi | 3 ++- doc/lispref/variables.texi | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index ed9aab245ea..f91f99d9c3d 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,11 @@ +2012-08-06 Eli Zaretskii + + * functions.texi (Closures): Put the main index entry for + "closures" here. (Bug#12138) + + * variables.texi (Lexical Binding): Disambiguate the index entry + for "closures". + 2012-06-19 Glenn Morris * Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737) diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 5958d56686d..f1ad252f294 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1115,8 +1115,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 closures 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 diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 93fb4d5f873..5745b487942 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -968,11 +968,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 From 638eaeb924506f36781213e71e02632660f71844 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 6 Aug 2012 13:41:32 -0400 Subject: [PATCH 4/9] * lisp/progmodes/cperl-mode.el (cperl-mode): Yet another fix for syntax-propertize-function. Fixes: debbugs:10095 --- lisp/ChangeLog | 9 +++++++-- lisp/progmodes/cperl-mode.el | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 635ecc054dd..a4a5ab7eb39 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-08-06 Stefan Monnier + + * progmodes/cperl-mode.el (cperl-mode): Yet another fix for + syntax-propertize-function (bug#10095). + 2012-07-28 Chong Yidong * progmodes/gdb-mi.el (gdb-place-breakpoints): Fix the call to @@ -15,8 +20,8 @@ 2012-07-21 Leo Liu - * progmodes/cc-cmds.el (c-defun-name): Use - match-string-no-properties instead for consistency. + * progmodes/cc-cmds.el (c-defun-name): + Use match-string-no-properties instead for consistency. 2012-07-20 Leo Liu diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 58cbf26496d..9c329a8902e 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -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) From d2d92e2425d847f410ad91ea238f651ebd3a03ff Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 6 Aug 2012 16:53:28 -0400 Subject: [PATCH 5/9] Remove non-standard comment from license section of commentary --- leim/quail/persian.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/leim/quail/persian.el b/leim/quail/persian.el index 70e2d380329..6ad41c01da1 100644 --- a/leim/quail/persian.el +++ b/leim/quail/persian.el @@ -1,4 +1,4 @@ -;;; persian.el --- Quail package for inputting Persian/Farsi keyboard -*- coding: utf-8;-*- +1;2c;;; persian.el --- Quail package for inputting Persian/Farsi keyboard -*- coding: utf-8;-*- ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. @@ -22,8 +22,6 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;; This is a Halaal Poly-Existential intended to remain perpetually Halaal. - ;;; Commentary: ;; ;; This file contains a collection of input methods for From 074945e333a5f33616a2506f0728e5e42e8315de Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 6 Aug 2012 17:33:21 -0400 Subject: [PATCH 6/9] Revert typo in previous --- leim/quail/persian.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leim/quail/persian.el b/leim/quail/persian.el index 6ad41c01da1..b95d595cadd 100644 --- a/leim/quail/persian.el +++ b/leim/quail/persian.el @@ -1,4 +1,4 @@ -1;2c;;; persian.el --- Quail package for inputting Persian/Farsi keyboard -*- coding: utf-8;-*- +;;; persian.el --- Quail package for inputting Persian/Farsi keyboard -*- coding: utf-8;-*- ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. From 5a4c42ba3066ef7403af30c404fbc4ab881e2573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Aptel?= Date: Mon, 6 Aug 2012 17:50:25 -0400 Subject: [PATCH 7/9] * doc/misc/url.texi (Parsed URLs): Adjust to the code's use of defstruct. Fixes: debbugs:12096 --- doc/misc/ChangeLog | 5 +++++ doc/misc/url.texi | 35 ++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index a4ecfab92fc..5a414e66f9a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2012-08-06 Aurélien Aptel + + * url.texi (Parsed URLs): Adjust to the code's use of defstruct + (bug#12096). + 2012-07-28 Eli Zaretskii * faq.texi (Right-to-left alphabets): Update for Emacs 24. diff --git a/doc/misc/url.texi b/doc/misc/url.texi index 680f1921479..898a9994a86 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -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. From de655540a92d18984ece661ee8f6000538749ab3 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 7 Aug 2012 11:24:35 +0800 Subject: [PATCH 8/9] Backport 2012-06-23T12:48:24Z!cyd@gnu.org from trunk --- lisp/ChangeLog | 4 ++++ lisp/mouse.el | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a4a5ab7eb39..d8bf55e0066 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-08-07 Chong Yidong + + * mouse.el (mouse-drag-track): Deactivate the mark before popping. + 2012-08-06 Stefan Monnier * progmodes/cperl-mode.el (cperl-mode): Yet another fix for diff --git a/lisp/mouse.el b/lisp/mouse.el index d9511c722ca..53238f03524 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -885,10 +885,15 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by (copy-region-as-kill (mark) (point))))) ;; Otherwise, run binding of terminating up-event. - (cond - (do-multi-click (goto-char start-point)) - (moved-off-start (deactivate-mark)) - (t (pop-mark))) + (setq foo (list (window-buffer (selected-window)) + (current-buffer))) + + (if do-multi-click + (goto-char start-point) + (deactivate-mark) + (unless moved-off-start + (pop-mark))) + (when (and (functionp fun) (= start-hscroll (window-hscroll start-window)) ;; Don't run the up-event handler if the window From 7178e7222c34f2654ccc126c64eb16fbe5f382b5 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 7 Aug 2012 11:24:52 +0800 Subject: [PATCH 9/9] Backport 2012-06-23T12:54:59Z!cyd@gnu.org from trunk --- lisp/mouse.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/lisp/mouse.el b/lisp/mouse.el index 53238f03524..aef344e3f2a 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -885,9 +885,6 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by (copy-region-as-kill (mark) (point))))) ;; Otherwise, run binding of terminating up-event. - (setq foo (list (window-buffer (selected-window)) - (current-buffer))) - (if do-multi-click (goto-char start-point) (deactivate-mark)