From d7a6097b57197da07cad511b99824fdcc95e14bf Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 9 Oct 2014 09:50:10 -0400 Subject: [PATCH 01/13] * src/frame.c (Fmouse_pixel_position): Call Vmouse_position_function. Fixes: debbugs:18638 --- src/ChangeLog | 5 +++++ src/frame.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c6d78a5e8d1..63e0e728fee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-10-09 Stefan Monnier + + * frame.c (Fmouse_pixel_position): Call Vmouse_position_function + (bug#18638). + 2014-10-08 K. Handa * coding.c (detect_coding_iso_2022): Set coding->rejected diff --git a/src/frame.c b/src/frame.c index 35fd190ba28..e894d218df7 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1583,7 +1583,8 @@ and nil for X and Y. */) { struct frame *f; Lisp_Object lispy_dummy; - Lisp_Object x, y; + Lisp_Object x, y, retval; + struct gcpro gcpro1; f = SELECTED_FRAME (); x = y = Qnil; @@ -1600,7 +1601,11 @@ and nil for X and Y. */) } XSETFRAME (lispy_dummy, f); - return Fcons (lispy_dummy, Fcons (x, y)); + retval = Fcons (lispy_dummy, Fcons (x, y)); + GCPRO1 (retval); + if (!NILP (Vmouse_position_function)) + retval = call1 (Vmouse_position_function, retval); + RETURN_UNGCPRO (retval); } DEFUN ("set-mouse-position", Fset_mouse_position, Sset_mouse_position, 3, 3, 0, @@ -4662,8 +4667,8 @@ is visible. In this case you can not overscroll. */); DEFVAR_LISP ("mouse-position-function", Vmouse_position_function, doc: /* If non-nil, function to transform normal value of `mouse-position'. -`mouse-position' calls this function, passing its usual return value as -argument, and returns whatever this function returns. +`mouse-position' and `mouse-pixel-position' call this function, passing their +usual return value as argument, and return whatever this function returns. This abnormal hook exists for the benefit of packages like `xt-mouse.el' which need to do mouse handling at the Lisp level. */); Vmouse_position_function = Qnil; From 078c4dc63523a1344dbbab6e69a3c213c67acfc6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 9 Oct 2014 08:59:41 -0700 Subject: [PATCH 02/13] Spelling fixes. --- lisp/org/org.el | 2 +- src/xfaces.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org/org.el b/lisp/org/org.el index c42102cac37..c4f8325de33 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -7571,7 +7571,7 @@ headline or the item and create a new headline/item with the text in the current line after point \(see `org-M-RET-may-split-line' on how to modify this behavior). -With one universal prefirx argument, set the user option +With one universal prefix argument, set the user option `org-insert-heading-respect-content' to t for the duration of the command. This modifies the behavior described above in this ways: on list items and at the beginning of normal lines, force diff --git a/src/xfaces.c b/src/xfaces.c index 9579bcce572..1dc068cf18a 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -3122,7 +3122,7 @@ FRAME 0 means change the face on all frames, and change the default /* FIXME: If frame is t, and selected frame is a tty frame, the font - can't be realized. An improvement wuld be to loop over frames + can't be realized. An improvement would be to loop over frames for a non-tty frame and use that. See discussion in bug#18573. */ From 52b16eb4c004da3b894fa92be65f42f55eb4c84f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 9 Oct 2014 09:07:40 -0700 Subject: [PATCH 03/13] * doc/lispref/elisp.texi (DATE): Bump to October 2014. I still have no idea what this is for, but newer is better! --- doc/lispref/ChangeLog | 2 ++ doc/lispref/elisp.texi | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 2ebd1bc9e52..56215f8c858 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2014-10-09 Glenn Morris + * elisp.texi (DATE): Bump to October 2014. + * frames.texi (Multiple Terminals): Copyedits. 2014-10-08 Eli Zaretskii diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 22df02113f0..973ee6f930c 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -56,7 +56,7 @@ @c (See comments for EDITION in emacs.texi) @set VERSION 3.1 @include emacsver.texi -@set DATE January 2013 +@set DATE October 2014 @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 From 7b9ecf78f03bcea9fe4c61dd863993203e24f34d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 9 Oct 2014 13:36:02 -0400 Subject: [PATCH 04/13] * doc/lispref/control.texi: Avoid overfull hbox. --- doc/lispref/control.texi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index edf60dd5cc8..800e174d3fc 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -328,13 +328,13 @@ lexical binding): @example (defun evaluate (exp env) (pcase exp - (`(add ,x ,y) (+ (evaluate x env) (evaluate y env))) - (`(call ,fun ,arg) (funcall (evaluate fun env) (evaluate arg env))) - (`(fn ,arg ,body) (lambda (val) - (evaluate body (cons (cons arg val) env)))) - ((pred numberp) exp) - ((pred symbolp) (cdr (assq exp env))) - (_ (error "Unknown expression %S" exp)))) + (`(add ,x ,y) (+ (evaluate x env) (evaluate y env))) + (`(call ,fun ,arg) (funcall (evaluate fun env) (evaluate arg env))) + (`(fn ,arg ,body) (lambda (val) + (evaluate body (cons (cons arg val) env)))) + ((pred numberp) exp) + ((pred symbolp) (cdr (assq exp env))) + (_ (error "Unknown expression %S" exp)))) @end example Where @code{`(add ,x ,y)} is a pattern that checks that @code{exp} is a three From ad1ababf7fdf791e53b7e069f6f5a42f1583db77 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 9 Oct 2014 13:39:07 -0400 Subject: [PATCH 05/13] * doc/emacs/help.texi: Avoid overfull hbox. --- doc/emacs/help.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index da831d76124..c2857331988 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -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 packages using a package menu buffer. @xref{Packages}. @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}). @item C-h r Display the Emacs manual in Info (@code{info-emacs-manual}). From 4b9d951ee1abd65dd6335300e764d0d8a368871f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 10 Oct 2014 00:03:27 -0400 Subject: [PATCH 06/13] * lisp/progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo. Reported by Arni Magnusson . * lisp/progmodes/prolog.el (prolog-electric--underscore): Same. Fixes: debbugs:18622 --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/bat-mode.el | 4 ++-- lisp/progmodes/prolog.el | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6831c0efb42..2abbf728ba5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-10-10 Stefan Monnier + + * progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo + (bug#18622). Reported by Arni Magnusson . + * progmodes/prolog.el (prolog-electric--underscore): Same. + 2014-10-09 Glenn Morris * frame.el (display-monitor-attributes-list): Doc tweaks. diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el index e328cfa0d8b..266c24adcca 100644 --- a/lisp/progmodes/bat-mode.el +++ b/lisp/progmodes/bat-mode.el @@ -78,11 +78,11 @@ "goto" "gtr" "if" "in" "leq" "lss" "neq" "not" "start")) (UNIX '("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)) ("^:[^:].*" . 'bat-label-face) - ("\\<_\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)" + ("\\_<\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)" (2 font-lock-variable-name-face)) ("%\\(\\w+\\)%?" (1 font-lock-variable-name-face)) diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 07d88b3f0fb..42904720d63 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -3139,7 +3139,7 @@ the following comma and whitespace, if any." (eq (char-before) ?_) (save-excursion (skip-chars-backward "[:alpha:]_") - (looking-at "\\<_[_[:upper:]][[:alnum:]_]*\\_>"))) + (looking-at "\\_<[_[:upper:]][[:alnum:]_]*\\_>"))) (replace-match "_") (skip-chars-forward ", \t\n"))))) From 390c2f3bcc494fa07752f59b42605afc9971111c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 10 Oct 2014 11:02:09 -0700 Subject: [PATCH 07/13] Fix port to Debian GNU/kFreeBSD 7 (wheezy). * process.c (accept4) [!HAVE_ACCEPT4]: New macro. Fixes: debbugs:18666 --- src/ChangeLog | 5 +++++ src/process.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 63e0e728fee..19c553ff7a1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-10-10 Paul Eggert + + Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666). + * process.c (accept4) [!HAVE_ACCEPT4]: New macro. + 2014-10-09 Stefan Monnier * frame.c (Fmouse_pixel_position): Call Vmouse_position_function diff --git a/src/process.c b/src/process.c index 2c66b9e976e..178fba8887e 100644 --- a/src/process.c +++ b/src/process.c @@ -173,6 +173,9 @@ close_on_exec (int fd) return fd; } +# undef accept4 +# define accept4(sockfd, addr, addrlen, flags) \ + process_accept4 (sockfd, addr, addrlen, flags) static int accept4 (int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) { From da373d7b88b63b63af1fd6a5632486d2c787616b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 11 Oct 2014 10:24:56 +0200 Subject: [PATCH 08/13] Fix mailaddress --- src/ChangeLog.11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index ac886d38966..fc6ff1fda6a 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -2241,7 +2241,7 @@ * xdisp.c (try_scrolling): Avoid infloop if the first line is obscured due to a vscroll (Bug#7537). -2010-12-13 Jan Djärv +2010-12-13 Jan Djärv * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT. From 20f02f27686767bdb0a68c2164c012741d2c635e Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Sat, 11 Oct 2014 13:16:12 -0400 Subject: [PATCH 09/13] * configure.ac (LD_SWITCH_SYSTEM_TEMACS) [CYGWIN]: Set stack size to 8 MB. (Bug#18438) --- ChangeLog | 5 +++++ configure.ac | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 256f78f6fb3..3567ce607df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-10-11 Ken Brown + + * configure.ac (LD_SWITCH_SYSTEM_TEMACS) [CYGWIN]: Set stack size + to 8 MB. (Bug#18438) + 2014-10-02 Paul Eggert * configure.ac: Port to strict POSIX shells on non-MinGW (Bug#18612). diff --git a/configure.ac b/configure.ac index 20acc46a1b3..185518b16a8 100644 --- a/configure.ac +++ b/configure.ac @@ -4857,6 +4857,8 @@ fi case "$opsys" in aix4-2) LD_SWITCH_SYSTEM_TEMACS="-Wl,-bnodelcsect" ;; + cygwin) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000" ;; + darwin) ## The -headerpad option tells ld (see man page) to leave room at the ## end of the header for adding load commands. Needed for dumping. From a9789a1d8c20a0f5b889930a808bc234c443b7ef Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sun, 12 Oct 2014 07:18:57 +0200 Subject: [PATCH 10/13] Merge Org 8.2.9 --- doc/misc/org.texi | 3 ++- lisp/org/ChangeLog | 14 ++++++++++++++ lisp/org/org-agenda.el | 1 + lisp/org/org-version.el | 4 ++-- lisp/org/org.el | 23 +++++++++++++---------- lisp/org/ox.el | 2 +- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/doc/misc/org.texi b/doc/misc/org.texi index d8a83fc18a4..7c796070fb3 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -2,7 +2,8 @@ @c %**start of header @setfilename ../../info/org @settitle The Org Manual -@set VERSION 8.2.8 + +@set VERSION 8.2.9 @c Version and Contact Info @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page} diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 0639ddf3a91..98adf5da0e4 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,17 @@ +2014-10-12 Christopher Schmidt + + * org.el (orgstruct-make-binding): Do not use loop in interpreted + code. + +2014-10-12 Mike McLean (tiny change) + + * org-agenda.el (org-agenda-time-grid): Change docstring. + +2014-10-12 Nicolas Goaziou + + * ox.el (org-export-async-start): Allow to use symbols as + function. + 2014-10-02 Achim Gratz * ob-sh.el (org-babel-sh-initiate-session): After initiating a diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 6f9db514d43..e0229367eeb 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -1472,6 +1472,7 @@ symbols specifying conditions when the grid should be displayed: weekly if the agenda shows an entire week 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 + remove-match skip grid times already present in an entry The second item is a string which will be placed behind the grid time. diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index b96025785c2..00f6c82272f 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of org-mode. Inserted by installing org-mode or when a release is made." - (let ((org-release "8.2.8")) + (let ((org-release "8.2.9")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of org-mode. 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.9")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index c4f8325de33..2b5603ce5af 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -7571,7 +7571,7 @@ headline or the item and create a new headline/item with the text in the current line after point \(see `org-M-RET-may-split-line' on how to modify this behavior). -With one universal prefix argument, set the user option +With one universal prefirx argument, set the user option `org-insert-heading-respect-content' to t for the duration of the command. This modifies the behavior described above in this ways: on list items and at the beginning of normal lines, force @@ -9099,14 +9099,16 @@ if `orgstruct-heading-prefix-regexp' is not empty." (if fallback (let* ((orgstruct-mode) (binding - (loop with key = ,key - for rep in - '(nil - ("<\\([^>]*\\)tab>" . "\\1TAB") - ("<\\([^>]*\\)return>" . "\\1RET") - ("<\\([^>]*\\)escape>" . "\\1ESC") - ("<\\([^>]*\\)delete>" . "\\1DEL")) - do + (let ((key ,key)) + (catch 'exit + (dolist + (rep + '(nil + ("<\\([^>]*\\)tab>" . "\\1TAB") + ("<\\([^>]*\\)return>" . "\\1RET") + ("<\\([^>]*\\)escape>" . "\\1ESC") + ("<\\([^>]*\\)delete>" . "\\1DEL")) + nil) (when rep (setq key (read-kbd-macro (let ((case-fold-search)) @@ -9114,7 +9116,8 @@ if `orgstruct-heading-prefix-regexp' is not empty." (car rep) (cdr rep) (key-description key)))))) - thereis (key-binding key)))) + (when (key-binding key) + (throw 'exit (key-binding key)))))))) (if (keymapp binding) (org-set-transient-map binding) (let ((func (or binding diff --git a/lisp/org/ox.el b/lisp/org/ox.el index dd81ad13d1d..24d0c874563 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -5532,7 +5532,7 @@ and `org-export-to-file' for more specialized functions." ;; Register running process in stack. (org-export-add-to-stack (get-buffer ,proc-buffer) nil ,process) ;; Set-up sentinel in order to catch results. - (let ((handler ,fun)) + (let ((handler ',fun)) (set-process-sentinel ,process `(lambda (p status) From b1be0eda33b545a25c2dc2cf8425c6f3fbf0c464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Sun, 12 Oct 2014 12:12:04 -0300 Subject: [PATCH 11/13] Fix import completion. * lisp/progmodes/python.el (python-shell-completion-get-completions): Fix import case regexp. Fixes: debbugs:18582 --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/python.el | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2abbf728ba5..9ec8c94fec3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-10-12 Fabián Ezequiel Gallina + + Fix import completion. (Bug#18582) + * progmodes/python.el (python-shell-completion-get-completions): + Fix import case regexp. + 2014-10-10 Stefan Monnier * progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index aa9d9b10dbc..a564acc3075 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2695,10 +2695,7 @@ LINE is used to detect the context on how to complete given INPUT." (save-excursion (buffer-substring-no-properties (line-beginning-position) ;End of prompt. - (progn - (re-search-backward "^") - (python-util-forward-comment) ;FIXME: Why? - (point))))) + (re-search-backward "^")))) (completion-code ;; Check whether a prompt matches a pdb string, an import ;; statement or just the standard prompt and use the @@ -2713,7 +2710,7 @@ LINE is used to detect the context on how to complete given INPUT." (t nil))) (input (if (string-match - (python-rx (+ space) (or "from" "import") space) + (python-rx line-start (* space) (or "from" "import") space) line) line input))) From 2222349c255e8f772d4cc098b412a869ca30d415 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 12 Oct 2014 11:41:05 -0700 Subject: [PATCH 12/13] * admin/make-tarball.txt: Small additions. --- admin/make-tarball.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index a2e8a9e7da3..c15db52d472 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -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. 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 will followup on the wrong list.) See the info-gnu-emacs mailing list archives for the form of past announcements. The first pretest announcement, and the release announcement, should have more detail. -12. For a release, update the Emacs homepage in the web repository. - Also update history.html, and add the new NEWS file as NEWS.xx.y. +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/NEWS.xx.y. Regenerate the html manuals (use make-manuals from admin.el). If there are new manuals, add appropriate index pages. + Delete any old manual pages that are no longer present. From e175fabcdd37f89db13ab90615cf0baa7bade4d9 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 13 Oct 2014 00:25:24 +0200 Subject: [PATCH 13/13] Sync Org 8.2.10 --- lisp/org/org-agenda.el | 3 +-- lisp/org/org-version.el | 4 ++-- lisp/org/ox-publish.el | 6 +++--- lisp/org/ox.el | 7 ++++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index e0229367eeb..c11c1c8ba41 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -5089,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." (require 'diary-lib) (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*") - (diary-display-hook '(fancy-diary-display)) - (diary-display-function 'fancy-diary-display) + (diary-display-function 'diary-fancy-display) (pop-up-frames nil) (diary-list-entries-hook (cons 'org-diary-default-entry diary-list-entries-hook)) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 00f6c82272f..aae65cc6d37 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of org-mode. Inserted by installing org-mode or when a release is made." - (let ((org-release "8.2.9")) + (let ((org-release "8.2.10")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of org-mode. Inserted by installing org-mode or when a release is made." - (let ((org-git-version "release_8.2.9")) + (let ((org-git-version "release_8.2.10")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el index 1dc790daf37..efc70d22a83 100644 --- a/lisp/org/ox-publish.el +++ b/lisp/org/ox-publish.el @@ -881,7 +881,7 @@ publishing will be done asynchronously, in another process." ;; project is still a string here. (list (assoc project org-publish-project-alist))))) (if async - (org-export-async-start 'ignore + (org-export-async-start (lambda (results) nil) `(let ((org-publish-use-timestamps-flag (if ',force nil ,org-publish-use-timestamps-flag))) (org-publish-projects ',project-alist))) @@ -899,7 +899,7 @@ optional argument ASYNC, publishing will be done asynchronously, in another process." (interactive "P") (if async - (org-export-async-start 'ignore + (org-export-async-start (lambda (results) nil) `(progn (when ',force (org-publish-remove-all-timestamps)) (let ((org-publish-use-timestamps-flag @@ -921,7 +921,7 @@ asynchronously, in another process." (interactive "P") (let ((file (buffer-file-name (buffer-base-buffer)))) (if async - (org-export-async-start 'ignore + (org-export-async-start (lambda (results) nil) `(let ((org-publish-use-timestamps-flag (if ',force nil ,org-publish-use-timestamps-flag))) (org-publish-file ,file))) diff --git a/lisp/org/ox.el b/lisp/org/ox.el index 24d0c874563..1327ae409ed 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -5479,8 +5479,9 @@ to `:default' encoding. If it fails, return S." (defmacro org-export-async-start (fun &rest body) "Call function FUN on the results returned by BODY evaluation. -BODY evaluation happens in an asynchronous process, from a buffer -which is an exact copy of the current one. +FUN is an anonymous function of one argument. BODY evaluation +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 in the stack. @@ -5532,7 +5533,7 @@ and `org-export-to-file' for more specialized functions." ;; Register running process in stack. (org-export-add-to-stack (get-buffer ,proc-buffer) nil ,process) ;; Set-up sentinel in order to catch results. - (let ((handler ',fun)) + (let ((handler ,fun)) (set-process-sentinel ,process `(lambda (p status)