Commit b1d5ab03 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org

parents ec11ab9b e175fabc
2014-10-12 Ken Brown <kbrown@cornell.edu>
* configure.ac (LD_SWITCH_SYSTEM_TEMACS) [CYGWIN]: Set stack size
to 8 MB. (Bug#18438)
2014-10-12 Jan Djärv <jan.h.d@swipnet.se> 2014-10-12 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac: Require OSX 10.6. Remove NSInteger test, * configure.ac: Require OSX 10.6. Remove NSInteger test,
......
...@@ -149,13 +149,15 @@ General steps (for each step, check for possible errors): ...@@ -149,13 +149,15 @@ General steps (for each step, check for possible errors):
11. Send an announcement to: emacs-devel, and bcc: info-gnu-emacs@gnu.org. 11. Send an announcement to: emacs-devel, and bcc: info-gnu-emacs@gnu.org.
For a pretest, also bcc: platform-testers@gnu.org. For a pretest, also bcc: platform-testers@gnu.org.
For a release, also bcc: info-gnu@gnu.org.
(The reason for using bcc: is to make it less likely that people (The reason for using bcc: is to make it less likely that people
will followup on the wrong list.) will followup on the wrong list.)
See the info-gnu-emacs mailing list archives for the form See the info-gnu-emacs mailing list archives for the form
of past announcements. The first pretest announcement, and the of past announcements. The first pretest announcement, and the
release announcement, should have more detail. release announcement, should have more detail.
12. For a release, update the Emacs homepage in the web repository. 12. For a release, update the Emacs homepage emacs.html in the web repository.
Also update history.html, and add the new NEWS file as NEWS.xx.y. Also update history.html, and add the new NEWS file as news/NEWS.xx.y.
Regenerate the html manuals (use make-manuals from admin.el). Regenerate the html manuals (use make-manuals from admin.el).
If there are new manuals, add appropriate index pages. If there are new manuals, add appropriate index pages.
Delete any old manual pages that are no longer present.
...@@ -4870,6 +4870,8 @@ fi ...@@ -4870,6 +4870,8 @@ fi
case "$opsys" in case "$opsys" in
aix4-2) LD_SWITCH_SYSTEM_TEMACS="-Wl,-bnodelcsect" ;; aix4-2) LD_SWITCH_SYSTEM_TEMACS="-Wl,-bnodelcsect" ;;
cygwin) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000" ;;
darwin) darwin)
## The -headerpad option tells ld (see man page) to leave room at the ## The -headerpad option tells ld (see man page) to leave room at the
## end of the header for adding load commands. Needed for dumping. ## end of the header for adding load commands. Needed for dumping.
......
...@@ -129,7 +129,7 @@ Display news of recent Emacs changes (@code{view-emacs-news}). ...@@ -129,7 +129,7 @@ Display news of recent Emacs changes (@code{view-emacs-news}).
Find packages by topic keyword (@code{finder-by-keyword}). This lists Find packages by topic keyword (@code{finder-by-keyword}). This lists
packages using a package menu buffer. @xref{Packages}. packages using a package menu buffer. @xref{Packages}.
@item C-h P @var{package} @key{RET} @item C-h P @var{package} @key{RET}
Display documentation about the package named @var{package} Display documentation about the specified package
(@code{describe-package}). (@code{describe-package}).
@item C-h r @item C-h r
Display the Emacs manual in Info (@code{info-emacs-manual}). Display the Emacs manual in Info (@code{info-emacs-manual}).
......
2014-10-12 Glenn Morris <rgm@gnu.org>
* elisp.texi (DATE): Bump to October 2014.
2014-10-09 Glenn Morris <rgm@gnu.org> 2014-10-09 Glenn Morris <rgm@gnu.org>
* frames.texi (Multiple Terminals): Copyedits. * frames.texi (Multiple Terminals): Copyedits.
......
...@@ -328,13 +328,13 @@ lexical binding): ...@@ -328,13 +328,13 @@ lexical binding):
@example @example
(defun evaluate (exp env) (defun evaluate (exp env)
(pcase exp (pcase exp
(`(add ,x ,y) (+ (evaluate x env) (evaluate y env))) (`(add ,x ,y) (+ (evaluate x env) (evaluate y env)))
(`(call ,fun ,arg) (funcall (evaluate fun env) (evaluate arg env))) (`(call ,fun ,arg) (funcall (evaluate fun env) (evaluate arg env)))
(`(fn ,arg ,body) (lambda (val) (`(fn ,arg ,body) (lambda (val)
(evaluate body (cons (cons arg val) env)))) (evaluate body (cons (cons arg val) env))))
((pred numberp) exp) ((pred numberp) exp)
((pred symbolp) (cdr (assq exp env))) ((pred symbolp) (cdr (assq exp env)))
(_ (error "Unknown expression %S" exp)))) (_ (error "Unknown expression %S" exp))))
@end example @end example
Where @code{`(add ,x ,y)} is a pattern that checks that @code{exp} is a three Where @code{`(add ,x ,y)} is a pattern that checks that @code{exp} is a three
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
@c (See comments for EDITION in emacs.texi) @c (See comments for EDITION in emacs.texi)
@set VERSION 3.1 @set VERSION 3.1
@include emacsver.texi @include emacsver.texi
@set DATE January 2013 @set DATE October 2014
@c in general, keep the following line commented out, unless doing a @c in general, keep the following line commented out, unless doing a
@c copy of this manual that will be published. The manual should go @c copy of this manual that will be published. The manual should go
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
@c %**start of header @c %**start of header
@setfilename ../../info/org.info @setfilename ../../info/org.info
@settitle The Org Manual @settitle The Org Manual
@set VERSION 8.2.8
@set VERSION 8.2.9
   
@c Version and Contact Info @c Version and Contact Info
@set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page} @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page}
......
2014-10-12 Fabián Ezequiel Gallina <fgallina@gnu.org>
Fix import completion. (Bug#18582)
* progmodes/python.el (python-shell-completion-get-completions):
Fix import case regexp.
2014-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo
(bug#18622). Reported by Arni Magnusson <arnima@hafro.is>.
* progmodes/prolog.el (prolog-electric--underscore): Same.
2014-10-12 Michael Albinus <michael.albinus@gmx.de> 2014-10-12 Michael Albinus <michael.albinus@gmx.de>
   
* net/tramp-sh.el (tramp-get-remote-id): Check also for "gid". * net/tramp-sh.el (tramp-get-remote-id): Check also for "gid".
......
2014-10-12 Christopher Schmidt <ch@ristopher.com>
* org.el (orgstruct-make-binding): Do not use loop in interpreted code.
2014-10-12 Mike McLean <mike.mclean@pobox.com> (tiny change)
* org-agenda.el (org-agenda-time-grid): Change docstring.
2014-10-12 Nicolas Goaziou <mail@nicolasgoaziou.fr>
* ox.el (org-export-async-start): Allow to use symbols as function.
2014-10-03 Achim Gratz <Stromeko@Stromeko.DE> 2014-10-03 Achim Gratz <Stromeko@Stromeko.DE>
   
* ob-sh.el (org-babel-sh-initiate-session): After initiating a * ob-sh.el (org-babel-sh-initiate-session): After initiating a
...@@ -1472,6 +1472,7 @@ symbols specifying conditions when the grid should be displayed: ...@@ -1472,6 +1472,7 @@ symbols specifying conditions when the grid should be displayed:
weekly if the agenda shows an entire week weekly if the agenda shows an entire week
today show grid on current date, independent of daily/weekly display today show grid on current date, independent of daily/weekly display
require-timed show grid only if at least one item has a time specification require-timed show grid only if at least one item has a time specification
remove-match skip grid times already present in an entry
The second item is a string which will be placed behind the grid time. The second item is a string which will be placed behind the grid time.
...@@ -5088,8 +5089,7 @@ of what a project is and how to check if it stuck, customize the variable ...@@ -5088,8 +5089,7 @@ of what a project is and how to check if it stuck, customize the variable
"Get the (Emacs Calendar) diary entries for DATE." "Get the (Emacs Calendar) diary entries for DATE."
(require 'diary-lib) (require 'diary-lib)
(let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*") (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*")
(diary-display-hook '(fancy-diary-display)) (diary-display-function 'diary-fancy-display)
(diary-display-function 'fancy-diary-display)
(pop-up-frames nil) (pop-up-frames nil)
(diary-list-entries-hook (diary-list-entries-hook
(cons 'org-diary-default-entry diary-list-entries-hook)) (cons 'org-diary-default-entry diary-list-entries-hook))
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
(defun org-release () (defun org-release ()
"The release version of org-mode. "The release version of org-mode.
Inserted by installing org-mode or when a release is made." Inserted by installing org-mode or when a release is made."
(let ((org-release "8.2.8")) (let ((org-release "8.2.10"))
org-release)) org-release))
;;;###autoload ;;;###autoload
(defun org-git-version () (defun org-git-version ()
"The Git version of org-mode. "The Git version of org-mode.
Inserted by installing org-mode or when a release is made." Inserted by installing org-mode or when a release is made."
(let ((org-git-version "release_8.2.8")) (let ((org-git-version "release_8.2.10"))
org-git-version)) org-git-version))
(provide 'org-version) (provide 'org-version)
......
...@@ -9099,14 +9099,16 @@ if `orgstruct-heading-prefix-regexp' is not empty." ...@@ -9099,14 +9099,16 @@ if `orgstruct-heading-prefix-regexp' is not empty."
(if fallback (if fallback
(let* ((orgstruct-mode) (let* ((orgstruct-mode)
(binding (binding
(loop with key = ,key (let ((key ,key))
for rep in (catch 'exit
'(nil (dolist
("<\\([^>]*\\)tab>" . "\\1TAB") (rep
("<\\([^>]*\\)return>" . "\\1RET") '(nil
("<\\([^>]*\\)escape>" . "\\1ESC") ("<\\([^>]*\\)tab>" . "\\1TAB")
("<\\([^>]*\\)delete>" . "\\1DEL")) ("<\\([^>]*\\)return>" . "\\1RET")
do ("<\\([^>]*\\)escape>" . "\\1ESC")
("<\\([^>]*\\)delete>" . "\\1DEL"))
nil)
(when rep (when rep
(setq key (read-kbd-macro (setq key (read-kbd-macro
(let ((case-fold-search)) (let ((case-fold-search))
...@@ -9114,7 +9116,8 @@ if `orgstruct-heading-prefix-regexp' is not empty." ...@@ -9114,7 +9116,8 @@ if `orgstruct-heading-prefix-regexp' is not empty."
(car rep) (car rep)
(cdr rep) (cdr rep)
(key-description key)))))) (key-description key))))))
thereis (key-binding key)))) (when (key-binding key)
(throw 'exit (key-binding key))))))))
(if (keymapp binding) (if (keymapp binding)
(org-set-transient-map binding) (org-set-transient-map binding)
(let ((func (or binding (let ((func (or binding
......
...@@ -881,7 +881,7 @@ publishing will be done asynchronously, in another process." ...@@ -881,7 +881,7 @@ publishing will be done asynchronously, in another process."
;; project is still a string here. ;; project is still a string here.
(list (assoc project org-publish-project-alist))))) (list (assoc project org-publish-project-alist)))))
(if async (if async
(org-export-async-start 'ignore (org-export-async-start (lambda (results) nil)
`(let ((org-publish-use-timestamps-flag `(let ((org-publish-use-timestamps-flag
(if ',force nil ,org-publish-use-timestamps-flag))) (if ',force nil ,org-publish-use-timestamps-flag)))
(org-publish-projects ',project-alist))) (org-publish-projects ',project-alist)))
...@@ -899,7 +899,7 @@ optional argument ASYNC, publishing will be done asynchronously, ...@@ -899,7 +899,7 @@ optional argument ASYNC, publishing will be done asynchronously,
in another process." in another process."
(interactive "P") (interactive "P")
(if async (if async
(org-export-async-start 'ignore (org-export-async-start (lambda (results) nil)
`(progn `(progn
(when ',force (org-publish-remove-all-timestamps)) (when ',force (org-publish-remove-all-timestamps))
(let ((org-publish-use-timestamps-flag (let ((org-publish-use-timestamps-flag
...@@ -921,7 +921,7 @@ asynchronously, in another process." ...@@ -921,7 +921,7 @@ asynchronously, in another process."
(interactive "P") (interactive "P")
(let ((file (buffer-file-name (buffer-base-buffer)))) (let ((file (buffer-file-name (buffer-base-buffer))))
(if async (if async
(org-export-async-start 'ignore (org-export-async-start (lambda (results) nil)
`(let ((org-publish-use-timestamps-flag `(let ((org-publish-use-timestamps-flag
(if ',force nil ,org-publish-use-timestamps-flag))) (if ',force nil ,org-publish-use-timestamps-flag)))
(org-publish-file ,file))) (org-publish-file ,file)))
......
...@@ -5479,8 +5479,9 @@ to `:default' encoding. If it fails, return S." ...@@ -5479,8 +5479,9 @@ to `:default' encoding. If it fails, return S."
(defmacro org-export-async-start (fun &rest body) (defmacro org-export-async-start (fun &rest body)
"Call function FUN on the results returned by BODY evaluation. "Call function FUN on the results returned by BODY evaluation.
BODY evaluation happens in an asynchronous process, from a buffer FUN is an anonymous function of one argument. BODY evaluation
which is an exact copy of the current one. happens in an asynchronous process, from a buffer which is an
exact copy of the current one.
Use `org-export-add-to-stack' in FUN in order to register results Use `org-export-add-to-stack' in FUN in order to register results
in the stack. in the stack.
......
...@@ -78,11 +78,11 @@ ...@@ -78,11 +78,11 @@
"goto" "gtr" "if" "in" "leq" "lss" "neq" "not" "start")) "goto" "gtr" "if" "in" "leq" "lss" "neq" "not" "start"))
(UNIX (UNIX
'("bash" "cat" "cp" "fgrep" "grep" "ls" "sed" "sh" "mv" "rm"))) '("bash" "cat" "cp" "fgrep" "grep" "ls" "sed" "sh" "mv" "rm")))
`(("\\<_\\(call\\|goto\\)\\_>[ \t]+%?\\([A-Za-z0-9-_\\:.]+\\)%?" `(("\\_<\\(call\\|goto\\)\\_>[ \t]+%?\\([A-Za-z0-9-_\\:.]+\\)%?"
(2 font-lock-constant-face t)) (2 font-lock-constant-face t))
("^:[^:].*" ("^:[^:].*"
. 'bat-label-face) . 'bat-label-face)
("\\<_\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)" ("\\_<\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)"
(2 font-lock-variable-name-face)) (2 font-lock-variable-name-face))
("%\\(\\w+\\)%?" ("%\\(\\w+\\)%?"
(1 font-lock-variable-name-face)) (1 font-lock-variable-name-face))
......
...@@ -3139,7 +3139,7 @@ the following comma and whitespace, if any." ...@@ -3139,7 +3139,7 @@ the following comma and whitespace, if any."
(eq (char-before) ?_) (eq (char-before) ?_)
(save-excursion (save-excursion
(skip-chars-backward "[:alpha:]_") (skip-chars-backward "[:alpha:]_")
(looking-at "\\<_[_[:upper:]][[:alnum:]_]*\\_>"))) (looking-at "\\_<[_[:upper:]][[:alnum:]_]*\\_>")))
(replace-match "_") (replace-match "_")
(skip-chars-forward ", \t\n"))))) (skip-chars-forward ", \t\n")))))
......
...@@ -2886,9 +2886,13 @@ When IMPORT is non-nil takes precedence over INPUT for ...@@ -2886,9 +2886,13 @@ When IMPORT is non-nil takes precedence over INPUT for
completion." completion."
(with-current-buffer (process-buffer process) (with-current-buffer (process-buffer process)
(let* ((prompt (let* ((prompt
(let ((prompt-boundaries (python-util-comint-last-prompt))) ;; Get last prompt of the inferior process buffer (this
;; intentionally avoids using `comint-last-prompt' because
;; of incompatibilities with Emacs 24.x).
(save-excursion
(buffer-substring-no-properties (buffer-substring-no-properties
(car prompt-boundaries) (cdr prompt-boundaries)))) (line-beginning-position) ;End of prompt.
(re-search-backward "^"))))
(completion-code (completion-code
;; Check whether a prompt matches a pdb string, an import ;; Check whether a prompt matches a pdb string, an import
;; statement or just the standard prompt and use the ;; statement or just the standard prompt and use the
......
2014-10-12 Paul Eggert <eggert@cs.ucla.edu>
Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666).
* process.c (accept4) [!HAVE_ACCEPT4]: New macro.
2014-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* frame.c (Fmouse_pixel_position): Call Vmouse_position_function
(bug#18638).
2014-10-12 Paul Eggert <eggert@cs.ucla.edu> 2014-10-12 Paul Eggert <eggert@cs.ucla.edu>
   
* editfns.c (dump_tz_string): No longer const. * editfns.c (dump_tz_string): No longer const.
......
...@@ -2241,7 +2241,7 @@ ...@@ -2241,7 +2241,7 @@
* xdisp.c (try_scrolling): Avoid infloop if the first line is * xdisp.c (try_scrolling): Avoid infloop if the first line is
obscured due to a vscroll (Bug#7537). obscured due to a vscroll (Bug#7537).
   
2010-12-13 Jan Djärv <jhd@zeplinf.localdomain> 2010-12-13 Jan Djärv <jan.h.d@swipnet.se>
   
* nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT. * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT.
   
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment