From 3e19f95997c14bd6cfd09518bc848206ee3fd9f8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 14 Oct 2014 09:09:09 -0700 Subject: [PATCH 1/5] * etc/NXML-NEWS: Add standard copyright and license notice. --- etc/NXML-NEWS | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/etc/NXML-NEWS b/etc/NXML-NEWS index ab0d351096d..8a284e2617b 100644 --- a/etc/NXML-NEWS +++ b/etc/NXML-NEWS @@ -1,3 +1,10 @@ +Copyright (C) 2007-2014 Free Software Foundation, Inc. +See the end of the file for license conditions. + + +For more recent changes, see the main Emacs NEWS file. + + 20041004 -------- @@ -197,3 +204,20 @@ Bug fixes. -------- Initial release. + + + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . From 1d4795e86695a436ef8bcd065caeb448ea442a26 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 14 Oct 2014 22:29:47 +0300 Subject: [PATCH 2/5] Fix display of R2L entries in tabulated-list-mode. lisp/emacs-lisp/tabulated-list.el (tabulated-list-mode): Force bidi-paragraph-direction to 'left-to-right'. This fixes buffer-menu display when the first buffer happens to start with R2L letter. --- lisp/ChangeLog | 7 +++++++ lisp/emacs-lisp/tabulated-list.el | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77ab12faaf9..6b99ae2f22f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-10-14 Eli Zaretskii + + * emacs-lisp/tabulated-list.el (tabulated-list-mode): Force + bidi-paragraph-direction to 'left-to-right'. This fixes + buffer-menu display when the first buffer happens to start with + R2L letter. + 2014-10-13 Glenn Morris * emacs-lisp/authors.el (authors-aliases, authors-fixed-case) diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index d0d71ddb935..86701068c4e 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -518,7 +518,10 @@ as the ewoc pretty-printer." (setq-local buffer-read-only t) (setq-local buffer-undo-list t) (setq-local revert-buffer-function #'tabulated-list-revert) - (setq-local glyphless-char-display tabulated-list-glyphless-char-display)) + (setq-local glyphless-char-display tabulated-list-glyphless-char-display) + ;; Avoid messing up the entries' display just because the first + ;; column of the first entry happens to begin with a R2L letter. + (setq bidi-paragraph-direction 'left-to-right)) (put 'tabulated-list-mode 'mode-class 'special) From ad7abc3fce746d1cd5a127f3dffacf9ee4c0567b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 14 Oct 2014 17:05:33 -0400 Subject: [PATCH 3/5] INSTALL trivia. --- INSTALL | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index ea0331da62f..1a714690c0d 100644 --- a/INSTALL +++ b/INSTALL @@ -31,9 +31,9 @@ some of the steps manually. The more detailed description in the other sections of this guide will help you do that, so please refer to those sections if you need to. - 1. Unpacking the Emacs 24.1 release requires about 180 MB of free - disk space. Building Emacs uses about another 70 MB of space. - The final installed Emacs uses about 110 MB of disk space. + 1. Unpacking the Emacs 24 release requires about 200 MB of free + disk space. Building Emacs uses about another 200 MB of space. + The final installed Emacs uses about 150 MB of disk space. This includes the space-saving that comes from automatically compressing the Lisp source files on installation. From e01955dfb3f1f47a11c9f1f907ef9234987f47d4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 14 Oct 2014 17:18:15 -0400 Subject: [PATCH 4/5] More INSTALL trivia --- INSTALL | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/INSTALL b/INSTALL index 1a714690c0d..2f4f41773c1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,5 @@ GNU Emacs Installation Guide -Copyright (C) 1992, 1994, 1996-1997, 2000-2014 Free Software Foundation, -Inc. +Copyright (C) 1992, 1994, 1996-1997, 2000-2014 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -209,20 +208,7 @@ DETAILED BUILDING AND INSTALLATION: see msdos/INSTALL. For later versions of MS Windows, see the file nt/INSTALL. For GNUstep and Mac OS X, see nextstep/INSTALL.) -1) Make sure your system has enough swapping space allocated to handle -a program whose pure code is 1.5 MB and whose data area is at -least 2.8 MB and can reach 100 MB or more. If the swapping space is -insufficient, you will get an error in the command `temacs -batch -l -loadup dump', found in `./src/Makefile.in', or possibly when -running the final dumped Emacs. (This should not be an issue -on any recent system.) - -Building Emacs requires about 230 MB of disk space (including the -Emacs sources). Once installed, Emacs occupies about 120 MB in the file -system where it is installed; this includes the executable files, Lisp -libraries, miscellaneous data files, and on-line documentation. If -the building and installation take place in different directories, -then the installation procedure momentarily requires 230+120 MB. +1) See the basic installation summary above for the disk space requirements. 2) In the unlikely event that `configure' does not detect your system type correctly, consult `./etc/MACHINES' to see what --host, --build @@ -262,7 +248,7 @@ Gtk or Motif, if you have the Xaw3d library installed (see You can tell configure where to search for GTK by specifying `--with-pkg-config-prog=PATH' where PATH is the pathname to -pkg-config. Note that GTK version 2.6 or newer is required for Emacs. +pkg-config. Emacs will autolaunch a D-Bus session bus, when the environment variable DISPLAY is set, but no session bus is running. This might be From 6d81466ac65eb84cb77eaa73e589628b5afcb963 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 14 Oct 2014 22:00:20 -0400 Subject: [PATCH 5/5] * lisp/emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'. Backported. Fixes: debbugs:18688 --- lisp/ChangeLog | 9 +++++++-- lisp/emacs-lisp/lisp.el | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6b99ae2f22f..7e09336183c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,12 @@ +2014-10-15 Stefan Monnier + + * emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'. + Backported (bug#18688). + 2014-10-14 Eli Zaretskii - * emacs-lisp/tabulated-list.el (tabulated-list-mode): Force - bidi-paragraph-direction to 'left-to-right'. This fixes + * emacs-lisp/tabulated-list.el (tabulated-list-mode): + Force bidi-paragraph-direction to 'left-to-right'. This fixes buffer-menu display when the first buffer happens to start with R2L letter. diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 80366db33d5..a7de1bd255e 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -711,6 +711,7 @@ considered." (`(condition-case ,v ,_ . ,catches) (lisp--local-variables-1 (cons v vars) (cdr (car (last catches))))) + (`(quote . ,_) (setq sexp nil)) (`(,_ . ,_) (lisp--local-variables-1 vars (car (last sexp)))) (`lisp--witness--lisp (or vars '(nil)))