[Emacs-diffs] trunk r118014: Merge from emacs-24

[Stefan Monnier]

------------------------------------------------------------
revno: 118014 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2014-10-02 11:13:05 -0400
message:
  Merge from emacs-24
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/package.texi         package.texi-20110825190024-lpvyu1zke977csqu-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/progmodes/python.el       python.el-20091113204419-o5vbwnq5f7feedwu-3008
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/package-test.el 
packagetest.el-20130627091655-6mb005jio30t2i3i-1

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-09-29 19:49:44 +0000
+++ b/doc/emacs/ChangeLog       2014-10-02 15:13:05 +0000
@@ -1,3 +1,7 @@
+2014-10-02  Glenn Morris  <address@hidden>
+
+       * package.texi (Package Installation): Mention etc/package-keyring.gpg.
+
 2014-09-29  Eli Zaretskii  <address@hidden>
 
        * emacsver.texi (EMACSVER): Bump to 20.0.50.

=== modified file 'doc/emacs/package.texi'
--- a/doc/emacs/package.texi    2014-06-05 08:14:36 +0000
+++ b/doc/emacs/package.texi    2014-10-01 23:29:46 +0000
@@ -184,11 +184,8 @@
 Use @kbd{M-x package-import-keyring} to import the key into Emacs.
 Emacs stores package keys in the @file{gnupg} subdirectory
 of @code{package-user-dir}.
address@hidden Uncomment this if it becomes true.
address@hidden
 The public key for the GNU package archive is distributed with Emacs,
 in the @file{etc/package-keyring.gpg}.  Emacs uses it automatically.
address@hidden ignore
 
 @vindex package-check-signature
 @vindex package-unsigned-archives

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-02 13:26:23 +0000
+++ b/lisp/ChangeLog    2014-10-02 15:13:05 +0000
@@ -1,3 +1,15 @@
+2014-10-02  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/package.el (package-import-keyring):
+       Create gnupg directory private.  (Bug#17625#155)
+
+2014-10-02  Stefan Monnier  <address@hidden>
+
+       * progmodes/python.el (python-shell-completion-get-completions):
+       Use python-shell--prompt-calculated-input-regexp from the
+       process buffer (bug#18582).
+       Don't assume that `line' comes from the process buffer.
+
 2014-10-02  Stefan Monnier  <address@hidden>
 
        * frame.el: Use lexical-binding (bug#18598).

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-09-30 23:19:31 +0000
+++ b/lisp/emacs-lisp/package.el        2014-10-02 15:13:05 +0000
@@ -289,6 +289,8 @@
   :group 'package
   :version "24.1")
 
+(defvar epg-gpg-program)
+
 (defcustom package-check-signature
   (if (progn (require 'epg-config) (executable-find epg-gpg-program))
       'allow-unsigned)
@@ -1299,7 +1301,8 @@
   (setq file (expand-file-name file))
   (let ((context (epg-make-context 'OpenPGP))
        (homedir (expand-file-name "gnupg" package-user-dir)))
-    (make-directory homedir t)
+    (with-file-modes 448
+      (make-directory homedir t))
     (epg-context-set-home-directory context homedir)
     (message "Importing %s..." (file-name-nondirectory file))
     (epg-import-keys-from-file context file)

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-09-29 11:05:40 +0000
+++ b/lisp/gnus/ChangeLog       2014-10-02 15:13:05 +0000
@@ -1,3 +1,8 @@
+2014-10-02  Daiki Ueno  <address@hidden>
+
+       * mml.el (mml-parse-1): Error out if unknown mode is specified in
+       <#secure> tag (bug#18513).
+
 2014-09-29  Daiki Ueno  <address@hidden>
 
        * mml.el (mml-parse-1): Error out if unknown mode is specified in

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2014-09-30 23:19:31 +0000
+++ b/lisp/progmodes/python.el  2014-10-02 15:13:05 +0000
@@ -2888,31 +2888,30 @@
   "Do completion at point using PROCESS for IMPORT or INPUT.
 When IMPORT is non-nil takes precedence over INPUT for
 completion."
-  (let* ((prompt
-          (with-current-buffer (process-buffer process)
+  (with-current-buffer (process-buffer process)
+    (let* ((prompt
             (let ((prompt-boundaries (python-util-comint-last-prompt)))
               (buffer-substring-no-properties
-               (car prompt-boundaries) (cdr prompt-boundaries)))))
-         (completion-code
-          ;; Check whether a prompt matches a pdb string, an import
-          ;; statement or just the standard prompt and use the
-          ;; correct python-shell-completion-*-code string
-          (cond ((and (string-match
-                       (concat "^" python-shell-prompt-pdb-regexp) prompt))
-                 ;; Since there are no guarantees the user will remain
-                 ;; in the same context where completion code was sent
-                 ;; (e.g. user steps into a function), safeguard
-                 ;; resending completion setup continuously.
-                 (concat python-shell-completion-setup-code
-                         "\nprint (" python-shell-completion-string-code ")"))
-                ((string-match
-                  python-shell--prompt-calculated-input-regexp prompt)
-                 python-shell-completion-string-code)
-                (t nil)))
-         (subject (or import input)))
-    (and completion-code
-         (> (length input) 0)
-         (with-current-buffer (process-buffer process)
+               (car prompt-boundaries) (cdr prompt-boundaries))))
+           (completion-code
+            ;; Check whether a prompt matches a pdb string, an import
+            ;; statement or just the standard prompt and use the
+            ;; correct python-shell-completion-*-code string
+            (cond ((and (string-match
+                         (concat "^" python-shell-prompt-pdb-regexp) prompt))
+                   ;; Since there are no guarantees the user will remain
+                   ;; in the same context where completion code was sent
+                   ;; (e.g. user steps into a function), safeguard
+                   ;; resending completion setup continuously.
+                   (concat python-shell-completion-setup-code
+                           "\nprint (" python-shell-completion-string-code 
")"))
+                  ((string-match
+                    python-shell--prompt-calculated-input-regexp prompt)
+                   python-shell-completion-string-code)
+                  (t nil)))
+           (subject (or import input)))
+      (and completion-code
+           (> (length input) 0)
            (let ((completions
                   (python-util-strip-string
                    (python-shell-send-string-no-output

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-02 14:01:27 +0000
+++ b/src/ChangeLog     2014-10-02 15:13:05 +0000
@@ -1,3 +1,9 @@
+2014-10-02  Jan Djärv  <address@hidden>
+
+       * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to
+       make a font_object from a tty frame (Bug#18573).
+       (Finternal_set_lisp_face_attribute): Add FIXME comment.
+
 2014-10-02  Dmitry Antipov  <address@hidden>
 
        * alloc.c (mark_overlay): Assume that overlay boundaries are
@@ -398,7 +404,7 @@
        * macfont.m (macfont_close): Release and free font-specific data
        only if it wasn't previously freed.
 
-2014-09-22  David Caldwell <address@hidden> (tiny change)
+2014-09-22  David Caldwell <address@hidden>  (tiny change)
 
        * unexmacosx.c (dump_it): Improve error message.
 
@@ -9808,7 +9814,7 @@
        * eval.c (Ffuncall): Fix handling of ((lambda ..) ..) in lexically
        scoped code (bug#11258).
 
-2013-08-28  Davor Cubranic  <address@hidden> (tiny change)
+2013-08-28  Davor Cubranic  <address@hidden>  (tiny change)
 
        * nsterm.m (last_window): New variable.
        (EV_TRAILER2): New macro.

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2014-10-01 03:28:16 +0000
+++ b/src/xfaces.c      2014-10-02 15:13:05 +0000
@@ -3112,17 +3112,26 @@
                f = XFRAME (selected_frame);
              else
                f = XFRAME (frame);
-             if (! FONT_OBJECT_P (value))
-               {
-                 Lisp_Object *attrs = XVECTOR (lface)->contents;
-                 Lisp_Object font_object;
-
-                 font_object = font_load_for_lface (f, attrs, value);
-                 if (NILP (font_object))
-                   signal_error ("Font not available", value);
-                 value = font_object;
-               }
-             set_lface_from_font (f, lface, value, 1);
+
+              /* FIXME:
+                 If frame is t, and selected frame is a tty frame, the font
+                 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.  */
+              if (f->terminal->type != output_termcap)
+                {
+                  if (! FONT_OBJECT_P (value))
+                    {
+                      Lisp_Object *attrs = XVECTOR (lface)->contents;
+                      Lisp_Object font_object;
+
+                      font_object = font_load_for_lface (f, attrs, value);
+                      if (NILP (font_object))
+                        signal_error ("Font not available", value);
+                      value = font_object;
+                    }
+                  set_lface_from_font (f, lface, value, 1);
+                }
            }
          else
            ASET (lface, LFACE_FONT_INDEX, value);

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-09-26 00:15:21 +0000
+++ b/test/ChangeLog    2014-10-02 15:13:05 +0000
@@ -1,3 +1,10 @@
+2014-10-02  Glenn Morris  <address@hidden>
+
+       * automated/package-test.el (with-package-test, package-test-signed):
+       Also set HOME to a temp value, in case the real one is absent (e.g.
+       hydra) or read-only.  (Bug#18575)
+       (package-test-signed): Use skip-unless rather than expected-result.
+
 2014-09-26  Leo Liu  <address@hidden>
 
        * automated/cl-lib.el (cl-digit-char-p, cl-parse-integer): New

=== modified file 'test/automated/package-test.el'
--- a/test/automated/package-test.el    2014-06-26 06:55:15 +0000
+++ b/test/automated/package-test.el    2014-10-02 15:13:05 +0000
@@ -89,6 +89,8 @@
   "Set up temporary locations and variables for testing."
   (declare (indent 1))
   `(let* ((package-test-user-dir (make-temp-file "pkg-test-user-dir-" t))
+          (process-environment (cons (format "HOME=%s" package-test-user-dir)
+                                     process-environment))
           (package-user-dir package-test-user-dir)
           (package-archives `(("gnu" . ,package-test-data-dir)))
           (old-yes-no-defn (symbol-function 'yes-or-no-p))
@@ -361,11 +363,15 @@
 
 (ert-deftest package-test-signed ()
   "Test verifying package signature."
-  :expected-result (condition-case nil
-                      (progn
+  (skip-unless (ignore-errors
+                (let ((homedir (make-temp-file "package-test" t)))
+                  (unwind-protect
+                      (let ((process-environment
+                             (cons (format "HOME=%s" homedir)
+                                   process-environment)))
                         (epg-check-configuration (epg-configuration))
-                        :passed)
-                    (error :failed))
+                        t)
+                    (delete-directory homedir t)))))
   (let* ((keyring (expand-file-name "key.pub" package-test-data-dir))
         (package-test-data-dir
           (expand-file-name "data/package/signed" package-test-file-dir)))