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>
* configure.ac: Require OSX 10.6. Remove NSInteger test,
......
......@@ -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.
......@@ -4870,6 +4870,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.
......
......@@ -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}).
......
2014-10-12 Glenn Morris <rgm@gnu.org>
* elisp.texi (DATE): Bump to October 2014.
2014-10-09 Glenn Morris <rgm@gnu.org>
* frames.texi (Multiple Terminals): Copyedits.
......
......@@ -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
......
......@@ -2,7 +2,8 @@
@c %**start of header
@setfilename ../../info/org.info
@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}
......
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>
 
* 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>
 
* ob-sh.el (org-babel-sh-initiate-session): After initiating a
......@@ -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.
......@@ -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."
(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))
......
......@@ -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.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.8"))
(let ((org-git-version "release_8.2.10"))
org-git-version))
(provide 'org-version)
......
......@@ -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
(let ((key ,key))
(catch 'exit
(dolist
(rep
'(nil
("<\\([^>]*\\)tab>" . "\\1TAB")
("<\\([^>]*\\)return>" . "\\1RET")
("<\\([^>]*\\)escape>" . "\\1ESC")
("<\\([^>]*\\)delete>" . "\\1DEL"))
do
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
......
......@@ -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)))
......
......@@ -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.
......
......@@ -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))
......
......@@ -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")))))
......
......@@ -2886,9 +2886,13 @@ When IMPORT is non-nil takes precedence over INPUT for
completion."
(with-current-buffer (process-buffer process)
(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
(car prompt-boundaries) (cdr prompt-boundaries))))
(line-beginning-position) ;End of prompt.
(re-search-backward "^"))))
(completion-code
;; Check whether a prompt matches a pdb string, an import
;; 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>
 
* editfns.c (dump_tz_string): No longer const.
......
......@@ -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 <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.
 
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