[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118102: Merge from emacs-24; up to r117576
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] trunk r118102: Merge from emacs-24; up to r117576 |
|
Date: |
Sun, 12 Oct 2014 22:57:30 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118102 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-10-12 15:56:45 -0700
message:
Merge from emacs-24; up to r117576
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
admin/make-tarball.txt
maketarball.txt-20091113204419-o5vbwnq5f7feedwu-2505
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
doc/emacs/help.texi help.texi-20091113204419-o5vbwnq5f7feedwu-6256
doc/lispref/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6155
doc/lispref/control.texi
control.texi-20091113204419-o5vbwnq5f7feedwu-6169
doc/lispref/elisp.texi elisp.texi-20091113204419-o5vbwnq5f7feedwu-6176
doc/misc/org.texi org.texi-20091113204419-o5vbwnq5f7feedwu-6313
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/org/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8688
lisp/org/org-agenda.el
orgagenda.el-20091113204419-o5vbwnq5f7feedwu-8640
lisp/org/org-version.el orgversion.el-20120930151248-fsivhdtofzv2elux-1
lisp/org/org.el org.el-20091113204419-o5vbwnq5f7feedwu-8617
lisp/org/ox-publish.el oxpublish.el-20131112130502-8825zrk0dp6b9sq5-16
lisp/org/ox.el ox.el-20131112130502-8825zrk0dp6b9sq5-18
lisp/progmodes/bat-mode.el dos.el-20130807152307-tdflff328dlln5w6-1
lisp/progmodes/prolog.el prolog.el-20091113204419-o5vbwnq5f7feedwu-98
lisp/progmodes/python.el python.el-20091113204419-o5vbwnq5f7feedwu-3008
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/ChangeLog.11 changelog.11-20110406121519-kxtjenhap6t9m2qn-1
src/frame.c frame.c-20091113204419-o5vbwnq5f7feedwu-243
src/process.c process.c-20091113204419-o5vbwnq5f7feedwu-462
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-10-12 08:35:50 +0000
+++ b/ChangeLog 2014-10-12 22:56:45 +0000
@@ -1,3 +1,8 @@
+2014-10-12 Ken Brown <address@hidden>
+
+ * configure.ac (LD_SWITCH_SYSTEM_TEMACS) [CYGWIN]: Set stack size
+ to 8 MB. (Bug#18438)
+
2014-10-12 Jan Djärv <address@hidden>
* configure.ac: Require OSX 10.6. Remove NSInteger test,
=== modified file 'admin/make-tarball.txt'
--- a/admin/make-tarball.txt 2014-05-02 19:45:17 +0000
+++ b/admin/make-tarball.txt 2014-10-12 18:41:05 +0000
@@ -149,13 +149,15 @@
11. Send an announcement to: emacs-devel, and bcc: address@hidden
For a pretest, also bcc: address@hidden
+ For a release, also bcc: address@hidden
(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.
=== modified file 'configure.ac'
--- a/configure.ac 2014-10-12 08:35:50 +0000
+++ b/configure.ac 2014-10-12 22:56:45 +0000
@@ -4870,6 +4870,8 @@
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.
=== modified file 'doc/emacs/help.texi'
--- a/doc/emacs/help.texi 2014-07-03 06:00:53 +0000
+++ b/doc/emacs/help.texi 2014-10-12 22:56:45 +0000
@@ -129,7 +129,7 @@
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}).
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2014-10-09 04:23:09 +0000
+++ b/doc/lispref/ChangeLog 2014-10-12 22:56:45 +0000
@@ -1,3 +1,7 @@
+2014-10-12 Glenn Morris <address@hidden>
+
+ * elisp.texi (DATE): Bump to October 2014.
+
2014-10-09 Glenn Morris <address@hidden>
* frames.texi (Multiple Terminals): Copyedits.
=== modified file 'doc/lispref/control.texi'
--- a/doc/lispref/control.texi 2014-09-06 00:59:00 +0000
+++ b/doc/lispref/control.texi 2014-10-12 22:56:45 +0000
@@ -328,13 +328,13 @@
@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
=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi 2014-10-04 08:20:24 +0000
+++ b/doc/lispref/elisp.texi 2014-10-12 22:56:45 +0000
@@ -56,7 +56,7 @@
@c (See comments for EDITION in emacs.texi)
@set VERSION 3.1
@include emacsver.texi
address@hidden DATE January 2013
address@hidden 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
=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2014-10-03 15:44:46 +0000
+++ b/doc/misc/org.texi 2014-10-12 22:56:45 +0000
@@ -2,7 +2,8 @@
@c %**start of header
@setfilename ../../info/org.info
@settitle The Org Manual
address@hidden VERSION 8.2.8
+
address@hidden VERSION 8.2.9
@c Version and Contact Info
@set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page}
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-12 20:09:15 +0000
+++ b/lisp/ChangeLog 2014-10-12 22:56:45 +0000
@@ -1,3 +1,15 @@
+2014-10-12 Fabián Ezequiel Gallina <address@hidden>
+
+ Fix import completion. (Bug#18582)
+ * progmodes/python.el (python-shell-completion-get-completions):
+ Fix import case regexp.
+
+2014-10-12 Stefan Monnier <address@hidden>
+
+ * progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo
+ (bug#18622). Reported by Arni Magnusson <address@hidden>.
+ * progmodes/prolog.el (prolog-electric--underscore): Same.
+
2014-10-12 Michael Albinus <address@hidden>
* net/tramp-sh.el (tramp-get-remote-id): Check also for "gid".
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog 2014-10-03 16:07:31 +0000
+++ b/lisp/org/ChangeLog 2014-10-12 22:56:45 +0000
@@ -1,3 +1,15 @@
+2014-10-12 Christopher Schmidt <address@hidden>
+
+ * org.el (orgstruct-make-binding): Do not use loop in interpreted code.
+
+2014-10-12 Mike McLean <address@hidden> (tiny change)
+
+ * org-agenda.el (org-agenda-time-grid): Change docstring.
+
+2014-10-12 Nicolas Goaziou <address@hidden>
+
+ * ox.el (org-export-async-start): Allow to use symbols as function.
+
2014-10-03 Achim Gratz <address@hidden>
* ob-sh.el (org-babel-sh-initiate-session): After initiating a
=== modified file 'lisp/org/org-agenda.el'
--- a/lisp/org/org-agenda.el 2014-10-03 08:13:51 +0000
+++ b/lisp/org/org-agenda.el 2014-10-12 22:25:24 +0000
@@ -1472,6 +1472,7 @@
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 @@
"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))
=== modified file 'lisp/org/org-version.el'
--- a/lisp/org/org-version.el 2014-10-03 08:13:51 +0000
+++ b/lisp/org/org-version.el 2014-10-12 22:25:24 +0000
@@ -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)
=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el 2014-10-12 20:09:15 +0000
+++ b/lisp/org/org.el 2014-10-12 22:56:45 +0000
@@ -9099,14 +9099,16 @@
(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 @@
(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
=== modified file 'lisp/org/ox-publish.el'
--- a/lisp/org/ox-publish.el 2014-10-03 08:13:51 +0000
+++ b/lisp/org/ox-publish.el 2014-10-12 22:25:24 +0000
@@ -881,7 +881,7 @@
;; 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 @@
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 @@
(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)))
=== modified file 'lisp/org/ox.el'
--- a/lisp/org/ox.el 2014-10-03 08:13:51 +0000
+++ b/lisp/org/ox.el 2014-10-12 22:25:24 +0000
@@ -5479,8 +5479,9 @@
(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.
=== modified file 'lisp/progmodes/bat-mode.el'
--- a/lisp/progmodes/bat-mode.el 2014-01-01 07:43:34 +0000
+++ b/lisp/progmodes/bat-mode.el 2014-10-10 04:03:27 +0000
@@ -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))
=== modified file 'lisp/progmodes/prolog.el'
--- a/lisp/progmodes/prolog.el 2014-07-28 09:39:09 +0000
+++ b/lisp/progmodes/prolog.el 2014-10-12 22:56:45 +0000
@@ -3139,7 +3139,7 @@
(eq (char-before) ?_)
(save-excursion
(skip-chars-backward "[:alpha:]_")
- (looking-at "\\<_[_[:upper:]][[:alnum:]_]*\\_>")))
+ (looking-at "\\_<[_[:upper:]][[:alnum:]_]*\\_>")))
(replace-match "_")
(skip-chars-forward ", \t\n")))))
=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el 2014-10-04 02:35:28 +0000
+++ b/lisp/progmodes/python.el 2014-10-12 22:56:45 +0000
@@ -2886,9 +2886,13 @@
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
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-12 20:36:49 +0000
+++ b/src/ChangeLog 2014-10-12 22:56:45 +0000
@@ -1,5 +1,15 @@
2014-10-12 Paul Eggert <address@hidden>
+ Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666).
+ * process.c (accept4) [!HAVE_ACCEPT4]: New macro.
+
+2014-10-12 Stefan Monnier <address@hidden>
+
+ * frame.c (Fmouse_pixel_position): Call Vmouse_position_function
+ (bug#18638).
+
+2014-10-12 Paul Eggert <address@hidden>
+
* editfns.c (dump_tz_string): No longer const.
It might be modified.
=== modified file 'src/ChangeLog.11'
--- a/src/ChangeLog.11 2014-01-26 00:47:40 +0000
+++ b/src/ChangeLog.11 2014-10-11 08:24:56 +0000
@@ -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 <address@hidden>
+2010-12-13 Jan Djärv <address@hidden>
* nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT.
=== modified file 'src/frame.c'
--- a/src/frame.c 2014-10-01 03:28:16 +0000
+++ b/src/frame.c 2014-10-12 22:56:45 +0000
@@ -1850,7 +1850,8 @@
{
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;
@@ -1867,7 +1868,11 @@
}
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);
}
#ifdef HAVE_WINDOW_SYSTEM
@@ -4869,8 +4874,8 @@
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;
=== modified file 'src/process.c'
--- a/src/process.c 2014-10-12 20:09:15 +0000
+++ b/src/process.c 2014-10-12 22:56:45 +0000
@@ -173,6 +173,9 @@
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)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118102: Merge from emacs-24; up to r117576,
Glenn Morris <=