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

22 files changed, 104 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 42e53b1fc76..ef58145f368 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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,
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.
diff --git a/configure.ac b/configure.ac
index fcbc2367ad4..a2badf0f91c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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.
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 10b5fcfb095..22bebed87df 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}).
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ba95d11399a..8ec524cc534 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 08d2ff35a6a..5cf6368db52 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
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 937345f21e4..fa665da34a4 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
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index cab8a811e6e..2af44239e8d 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -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}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b07a6b0d851..41c68d7fbee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+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".
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 5a8a9b250a1..38e2eb7a96f 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,15 @@
+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
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 6f9db514d43..c11c1c8ba41 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.
 
@@ -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))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index b96025785c2..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.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)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 05a26a80cbe..1604241f6b3 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -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-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 dd81ad13d1d..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.
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 853f2d0dad2..3f98708e2e3 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")))))
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index dfefe837569..b230992fc98 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -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
diff --git a/src/ChangeLog b/src/ChangeLog
index b47fb4c9d0f..add43dc4b07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 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.
 	It might be modified.
 
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  <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.
 
diff --git a/src/frame.c b/src/frame.c
index d0527bf2a9c..a3139173655 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1850,7 +1850,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;
@@ -1867,7 +1868,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);
 }
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -4869,8 +4874,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;
diff --git a/src/process.c b/src/process.c
index 0c36f8e18c3..06fc918cf54 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)
 {