Merge from emacs-24

7 files changed, 33 insertions, 20 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb23aaf766b..271be39eea9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-22  Kan-Ru Chen  <kanru@kanru.info>
+
+        * window.el (fit-window-to-buffer): When counting buffer width,
+        count the whole visible buffer.  Correctly convert the body-height
+        to pixel size for window-text-pixel-size (Bug#18498).
+
 2014-09-22  Sam Steingold  <sds@gnu.org>
 
         * progmodes/sql.el (sql-product-alist): Improve the Vertica entry.
@@ -191,8 +197,8 @@
         (pcase--expand): Use it.
         (pcase-exhaustive): New macro.  (Bug#16567)
 
-        * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Add
-        pcase-exhaustive.
+        * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2):
+        Add pcase-exhaustive.
 
 2014-09-13  Eli Zaretskii  <eliz@gnu.org>
 
@@ -349,8 +355,8 @@
 
 2014-09-05  Martin Rudalics  <rudalics@gmx.at>
 
-        * scroll-bar.el (horizontal-scroll-bars-available-p): New
-        function.
+        * scroll-bar.el (horizontal-scroll-bars-available-p):
+        New function.
         (horizontal-scroll-bar-mode): Rewrite using
         horizontal-scroll-bars-available-p.
         * menu-bar.el (menu-bar-showhide-scroll-bar-menu): Rewrite using
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 820e75260a9..9aabc9c9e0d 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-22  David Engster  <deng@randomsample.de>
+
+        * ede/emacs.el (ede-emacs-version): Do not call 'egrep' to
+        determine Emacs version (it was dead code anyway).  Make sure that
+        configure.ac or configure.in exist.  (Bug#18476)
+
 2014-06-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * semantic/ia.el (semantic-ia-complete-symbol-menu): Use posn-at-point
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index 43f16da8a77..76925a66713 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -80,12 +80,6 @@ Return a tuple of ( EMACSNAME . VERSION )."
     (with-current-buffer buff
       (erase-buffer)
       (setq default-directory (file-name-as-directory dir))
-      (or (file-exists-p configure_ac)
-          (setq configure_ac "configure.in"))
-      ;(call-process "egrep" nil buff nil "-n" "-e" "^version=" "Makefile")
-      (call-process "egrep" nil buff nil "-n" "-e" "AC_INIT" configure_ac)
-      (goto-char (point-min))
-      ;(re-search-forward "version=\\([0-9.]+\\)")
       (cond
        ;; Maybe XEmacs?
        ((file-exists-p "version.sh")
@@ -113,7 +107,8 @@ m4_define(\\[SXEM4CS_BETA_VERSION\\], \\[\\([0-9]+\\)\\])")
        ;; Insert other Emacs here...
 
        ;; Vaguely recent version of GNU Emacs?
-       (t
+       ((or (file-exists-p configure_ac)
+            (file-exists-p (setq configure_ac "configure.in")))
         (insert-file-contents configure_ac)
         (goto-char (point-min))
         (re-search-forward "AC_INIT(\\(?:GNU \\)?[eE]macs,\\s-*\\([0-9.]+\\)\\s-*[,)]")
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 9554c6e519c..b99f57cfbfd 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-22  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * url.el (url-retrieve-internal): Clarify the docstring.
+
+        * url-http.el (url-http): Same.  (Bug#18116)
+
 2014-08-07  Reuben Thomas  <rrt@sc3d.org>
 
         * url-handlers.el: Remove a comment about VMS, which we no longer
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 608a865be7b..cba4c6fbc02 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1171,8 +1171,8 @@ the end of the document."
   "Retrieve URL via HTTP asynchronously.
 URL must be a parsed URL.  See `url-generic-parse-url' for details.
 
-When retrieval is completed, execute the function CALLBACK, using
-the arguments listed in CBARGS.  The first element in CBARGS
+When retrieval is completed, execute the function CALLBACK, passing it
+an updated value of CBARGS as arguments.  The first element in CBARGS
 should be a plist describing what has happened so far during the
 request, as described in the docstring of `url-retrieve' (if in
 doubt, specify nil).
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 620593a9a81..4594ab6a7f7 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -170,8 +170,8 @@ URL-encoded before it's used."
 (defun url-retrieve-internal (url callback cbargs &optional silent
                                   inhibit-cookies)
   "Internal function; external interface is `url-retrieve'.
-CBARGS is the list of arguments that the callback function will
-receive; its first element should be a plist specifying what has
+The callback function will receive an updated value of CBARGS as
+arguments; its first element should be a plist specifying what has
 happened so far during the request, as described in the docstring
 of `url-retrieve' (if in doubt, specify nil).
 
diff --git a/lisp/window.el b/lisp/window.el
index c19392f1fe9..5ac04c7e99a 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7377,10 +7377,10 @@ accessible position."
                              max-width))
                     (+ total-width (window-max-delta
                                     nil t nil nil nil nil pixelwise))))
-                 ;; When fitting vertically, assume that WINDOW's start
-                 ;; position remains unaltered.  WINDOW can't get wider
-                 ;; than its frame's pixel width, its height remains
-                 ;; unaltered.
+                 ;; When fitting horizontally, assume that WINDOW's
+                 ;; start position remains unaltered.  WINDOW can't get
+                 ;; wider than its frame's pixel width, its height
+                 ;; remains unaltered.
                  (width (+ (car (window-text-pixel-size
                                  nil (window-start) (point-max)
                                  (frame-pixel-width)
@@ -7389,7 +7389,7 @@ accessible position."
                                  ;; overshoots when the first line below
                                  ;; the bottom is wider than the window.
                                  (* body-height
-                                    (if pixelwise char-height 1))))
+                                    (if pixelwise 1 char-height))))
                            (window-right-divider-width))))
             (unless pixelwise
               (setq width (/ (+ width char-width -1) char-width)))