12 files changed, 147 insertions, 60 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3aae01b9f1e..5b54d34743c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,59 @@
+2013-01-04  Daiki Ueno  <ueno@gnu.org>
+
+        * epg.el: Silence byte-compiler warnings.
+        (epg--start): Use delete-char instead of delete-backward-char.
+        (epg-wait-for-completion): Pass FRAME arg to redraw-frame.
+
+2013-01-04  Daiki Ueno  <ueno@gnu.org>
+
+        * epg.el (epg--start): Don't call "tty" program on W32 platforms.
+        Suggested by Eli Zaretskii  <eliz@gnu.org>.
+
+2013-01-04  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-set-file-uid-gid): UID and GID must be
+        non-negative integers.  Otherwise, the default values are used.
+        (tramp-convert-file-attributes): Convert uid and gid to integers.
+
+2013-01-04  Glenn Morris  <rgm@gnu.org>
+
+        * term.el (term-handle-colors-array): Ensure face attributes
+        are fully specified, not nil.  (Bug#13337)
+
+        * term.el (term-default-fg-color, term-default-bg-color):
+        Fix custom type.
+
+        * progmodes/etags.el (tags-compression-info-list): Doc fix.
+        (tag-find-file-of-tag-noselect): Check auto-compression-mode
+        rather than 'jka-compr being loaded.  (Bug#13338)
+
+2013-01-04  Wesley Dawson  <whd@lavabit.com>  (tiny change)
+
+        * icomplete.el (icomplete-completions):
+        Honor icomplete-prospects-height once more following
+        2012-11-29 changes.  (Bug#13224)
+
+2013-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (internal--called-interactively-p--get-frame): Find aliases
+        of called-interactively-p as well (bug#13237).
+
+        * view.el (view--enable, view--disable): Rename from view-mode-enable
+        and view-mode-disable and assume it's called from view-mode.
+        (view-mode-enable, view-mode-disable): Redefine as obsolete
+        compatibility layer above view-mode.
+        (view-mode-enter): Call `view-mode'.
+
+        * files.el (after-find-file): Call `view-mode'.
+
+        * doc-view.el (doc-view-scale-internally): New var.
+        (doc-view-enlarge, doc-view-insert-image): Obey it.
+
+2013-01-03  Daiki Ueno  <ueno@gnu.org>
+
+        * epg.el (epg--start): Ignore errors when /dev/fd/0 does not
+        exist.  (Bug#13344)
+
 2013-01-03  Glenn Morris  <rgm@gnu.org>
 
         * mail/rmail.el (rmail-set-header-1): Ignore case.
@@ -338,6 +394,8 @@
         (lm-homepage): New function.
         (lm-with-file): Don't be confused if narrowing is in effect.
 
+2012-12-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the
         very beginning of a hunk (e.g. killing the first line).
 
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index ad1ff848112..24434d294c6 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -173,9 +173,17 @@ Higher values result in larger images."
   :type 'number
   :group 'doc-view)
 
+(defcustom doc-view-scale-internally t
+  "Whether we should try to rescale images ourselves.
+If nil, the document is re-rendered every time the scaling factor is modified.
+This only has an effect if the image libraries linked with Emacs support
+scaling."
+  :type 'boolean)
+
 (defcustom doc-view-image-width 850
   "Default image width.
-Has only an effect if imagemagick support is compiled into emacs."
+Has only an effect if `doc-view-scale-internally' is non-nil and support for
+scaling is compiled into emacs."
   :version "24.1"
   :type 'number
   :group 'doc-view)
@@ -669,8 +677,9 @@ OpenDocument format)."
 (defun doc-view-enlarge (factor)
   "Enlarge the document by FACTOR."
   (interactive (list doc-view-shrink-factor))
-  (if (eq (plist-get (cdr (doc-view-current-image)) :type)
-          'imagemagick)
+  (if (and doc-view-scale-internally
+           (eq (plist-get (cdr (doc-view-current-image)) :type)
+               'imagemagick))
       ;; ImageMagick supports on-the-fly-rescaling.
       (let ((new (ceiling (* factor doc-view-image-width))))
         (unless (equal new doc-view-image-width)
@@ -1133,10 +1142,11 @@ ARGS is a list of image descriptors."
     (setq doc-view-pending-cache-flush nil))
   (let ((ol (doc-view-current-overlay))
         (image (if (and file (file-readable-p file))
-                   (if (not (fboundp 'imagemagick-types))
+                   (if (not (and doc-view-scale-internally
+                                 (fboundp 'imagemagick-types)))
                        (apply 'create-image file 'png nil args)
                      (unless (member :width args)
-                       (setq args (append args (list :width doc-view-image-width))))
+                       (setq args `(,@args :width ,doc-view-image-width)))
                      (apply 'create-image file 'imagemagick nil args))))
         (slice (doc-view-current-slice)))
     (setf (doc-view-current-image) image)
diff --git a/lisp/epg.el b/lisp/epg.el
index 6be3ba15a97..3f04aa2e07a 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1166,10 +1166,13 @@ This function is for internal use only."
     ;; Set GPG_TTY and TERM for pinentry-curses.  Note that we can't
     ;; use `terminal-name' here to get the real pty name for the child
     ;; process, though /dev/fd/0" is not portable.
-    (with-temp-buffer
-      (when (= (call-process "tty" "/dev/fd/0" t) 0)
-        (delete-backward-char 1)
-        (setq terminal-name (buffer-string))))
+    (unless (memq system-type '(ms-dos windows-nt))
+      (with-temp-buffer
+        (condition-case nil
+            (when (= (call-process "tty" "/dev/fd/0" t) 0)
+              (delete-char -1)
+              (setq terminal-name (buffer-string)))
+          (file-error))))
     (when terminal-name
       (setq process-environment
             (cons (concat "GPG_TTY=" terminal-name)
@@ -1297,7 +1300,7 @@ This function is for internal use only."
              (> (float-time (or (nth 5 (file-attributes epg-agent-file))
                                 '(0 0 0 0)))
                 (float-time epg-agent-mtime))))
-      (redraw-frame))
+      (redraw-frame (selected-frame)))
   (epg-context-set-result-for
    context 'error
    (nreverse (epg-context-result-for context 'error))))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 0366addacfc..3a625eb215e 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-04  Glenn Morris  <rgm@gnu.org>
+
+        * erc-backend.el (312): Fix typo.  (Bug#13235)
+
 2012-11-30  Glenn Morris  <rgm@gnu.org>
 
         * erc.el (erc-accidental-paste-threshold-seconds): Add :version.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index c8b7286c7dd..3d3ac791f08 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1633,8 +1633,8 @@ See `erc-display-server-message'." nil
 
 (define-erc-response-handler (312)
   "Server name response in WHOIS." nil
-  (pcase-let ((`(,nick ,server-host))
-              (cdr (erc-response.command-args parsed)))
+  (pcase-let ((`(,nick ,server-host)
+              (cdr (erc-response.command-args parsed))))
     (erc-display-message
      parsed 'notice 'active 's312
      ?n nick ?s server-host ?c (erc-response.contents parsed))))
diff --git a/lisp/files.el b/lisp/files.el
index 6a2945cbc79..ca5a415fb8e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -209,7 +209,6 @@ have fast storage with limited space, such as a RAM disk."
 (declare-function dired-unmark "dired" (arg))
 (declare-function dired-do-flagged-delete "dired" (&optional nomessage))
 (declare-function dos-8+3-filename "dos-fns" (filename))
-(declare-function view-mode-disable "view" ())
 (declare-function dosified-file-name "dos-fns" (file-name))
 
 (defvar file-name-invalid-regexp
@@ -2125,7 +2124,7 @@ unless NOMODES is non-nil."
     (setq buffer-read-only t))
   (unless nomodes
     (when (and view-read-only view-mode)
-      (view-mode-disable))
+      (view-mode -1))
     (normal-mode t)
     ;; If requested, add a newline at the end of the file.
     (and (memq require-final-newline '(visit visit-save))
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 0493a5b49e8..9407de4f6d9 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -343,8 +343,10 @@ are exhibited within the square braces.)"
                                 (t (concat "…" (substring most compare))))
                                close-bracket)))
              ;;"-prospects" - more than one candidate
-             (prospects-len (+ (length determ) 6 ;; take {,...} into account
-                               (string-width (buffer-string))))
+             (prospects-len (+ (length determ)
+                               (string-width icomplete-separator)
+                               3 ;; take {…} into account
+                               (string-width (buffer-string))))
              (prospects-max
               ;; Max total length to use, including the minibuffer content.
               (* (+ icomplete-prospects-height
@@ -375,7 +377,9 @@ are exhibited within the square braces.)"
             (cond ((string-equal comp "") (setq most-is-exact t))
                   ((member comp prospects))
                   (t (setq prospects-len
-                           (+ (string-width comp) 1 prospects-len))
+                           (+ (string-width comp)
+                              (string-width icomplete-separator)
+                              prospects-len))
                      (if (< prospects-len prospects-max)
                          (push comp prospects)
                        (setq limit t))))))
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 5bbf1708654..79f8d82b02b 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1452,23 +1452,22 @@ of."
 (defun tramp-set-file-uid-gid (filename &optional uid gid)
   "Set the ownership for FILENAME.
 If UID and GID are provided, these values are used; otherwise uid
-and gid of the corresponding user is taken.  Both parameters must be integers."
+and gid of the corresponding user is taken.  Both parameters must
+be non-negative integers."
   ;; Modern Unices allow chown only for root.  So we might need
   ;; another implementation, see `dired-do-chown'.  OTOH, it is mostly
   ;; working with su(do)? when it is needed, so it shall succeed in
   ;; the majority of cases.
   ;; Don't modify `last-coding-system-used' by accident.
-  (let ((last-coding-system-used last-coding-system-used)
-        (uid (and (numberp uid) (round uid)))
-        (gid (and (numberp gid) (round gid))))
+  (let ((last-coding-system-used last-coding-system-used))
     (if (file-remote-p filename)
         (with-parsed-tramp-file-name filename nil
           (if (and (zerop (user-uid)) (tramp-local-host-p v))
               ;; If we are root on the local host, we can do it directly.
               (tramp-set-file-uid-gid localname uid gid)
-            (let ((uid (or (and (integerp uid) uid)
+            (let ((uid (or (and (natnump uid) uid)
                            (tramp-get-remote-uid v 'integer)))
-                  (gid (or (and (integerp gid) gid)
+                  (gid (or (and (natnump gid) gid)
                            (tramp-get-remote-gid v 'integer))))
               (tramp-send-command
                v (format
@@ -1477,8 +1476,8 @@ and gid of the corresponding user is taken.  Both parameters must be integers."
 
       ;; We handle also the local part, because there doesn't exist
       ;; `set-file-uid-gid'.  On W32 "chown" might not work.
-      (let ((uid (or (and (integerp uid) uid) (tramp-get-local-uid 'integer)))
-            (gid (or (and (integerp gid) gid) (tramp-get-local-gid 'integer))))
+      (let ((uid (or (and (natnump uid) uid) (tramp-get-local-uid 'integer)))
+            (gid (or (and (natnump gid) gid) (tramp-get-local-gid 'integer))))
         (tramp-compat-call-process
          "chown" nil nil nil
          (format "%d:%d" uid gid) (tramp-shell-quote-argument filename))))))
@@ -4665,7 +4664,7 @@ raises an error."
                   command (buffer-string))))))))
 
 (defun tramp-convert-file-attributes (vec attr)
-  "Convert file-attributes ATTR generated by perl script, stat or ls.
+  "Convert `file-attributes' ATTR generated by perl script, stat or ls.
 Convert file mode bits to string and set virtual device number.
 Return ATTR."
   (when attr
@@ -4673,6 +4672,17 @@ Return ATTR."
     (when (stringp (car attr))
       (while (string-match tramp-color-escape-sequence-regexp (car attr))
         (setcar attr (replace-match "" nil nil (car attr)))))
+    ;; Convert uid and gid.  Use -1 as indication of unusable value.
+    (when (and (numberp (nth 2 attr)) (< (nth 2 attr) 0))
+      (setcar (nthcdr 2 attr) -1))
+    (when (and (floatp (nth 2 attr))
+               (<= (nth 2 attr) (tramp-compat-most-positive-fixnum)))
+      (setcar (nthcdr 2 attr) (round (nth 2 attr))))
+    (when (and (numberp (nth 3 attr)) (< (nth 3 attr) 0))
+      (setcar (nthcdr 3 attr) -1))
+    (when (and (floatp (nth 3 attr))
+               (<= (nth 3 attr) (tramp-compat-most-positive-fixnum)))
+      (setcar (nthcdr 3 attr) (round (nth 3 attr))))
     ;; Convert last access time.
     (unless (listp (nth 4 attr))
       (setcar (nthcdr 4 attr)
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 0dfc7f27a9c..81dc31792c3 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -67,11 +67,8 @@ Use the `etags' program to make a tags table file."
 ;;;###autoload
 (defcustom tags-compression-info-list
   (purecopy '("" ".Z" ".bz2" ".gz" ".xz" ".tgz"))
-  "List of extensions tried by etags when jka-compr is used.
-An empty string means search the non-compressed file.
-These extensions will be tried only if jka-compr was activated
-\(i.e. via customize of `auto-compression-mode' or by calling the function
-`auto-compression-mode')."
+  "List of extensions tried by etags when `auto-compression-mode' is on.
+An empty string means search the non-compressed file."
   :version "24.1"                       ; added xz
   :type  '(repeat string)
   :group 'etags)
@@ -1182,7 +1179,7 @@ error message."
   "Find the right line in the specified FILE."
   ;; If interested in compressed-files, search files with extensions.
   ;; Otherwise, search only the real file.
-  (let* ((buffer-search-extensions (if (featurep 'jka-compr)
+  (let* ((buffer-search-extensions (if auto-compression-mode
                                        tags-compression-info-list
                                      '("")))
          the-buffer
@@ -1206,7 +1203,7 @@ error message."
           (setq file-search-extensions (cdr file-search-extensions))
         (setq the-buffer (find-file-noselect (concat file (car file-search-extensions))))))
     (if (not the-buffer)
-        (if (featurep 'jka-compr)
+        (if auto-compression-mode
             (error "File %s (with or without extensions %s) not found" file tags-compression-info-list)
           (error "File %s not found" file))
       (set-buffer the-buffer))))
diff --git a/lisp/subr.el b/lisp/subr.el
index 7ca0169abdb..11e882d9158 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3977,8 +3977,8 @@ the number of frames to skip (minus 1).")
     `(progn
        (defvar ,sym
          (let ((i 1))
-           (while (not (eq (nth 1 (backtrace-frame i))
-                           'called-interactively-p))
+           (while (not (eq (indirect-function (nth 1 (backtrace-frame i)) t)
+                           (indirect-function 'called-interactively-p)))
              (setq i (1+ i)))
            i))
        ;; (unless (eq (nth 1 (backtrace-frame ,sym)) 'called-interactively-p)
diff --git a/lisp/term.el b/lisp/term.el
index fc7ec3ad0f9..b37e71280da 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -778,14 +778,14 @@ Buffer local variable.")
 (defcustom term-default-fg-color nil
   "If non-nil, default color for foreground in Term mode."
   :group 'term
-  :type 'string)
+  :type '(choice (const nil) (string :tag "color")))
 (make-obsolete-variable 'term-default-fg-color "use the face `term' instead."
                         "24.3")
 
 (defcustom term-default-bg-color nil
   "If non-nil, default color for foreground in Term mode."
   :group 'term
-  :type 'string)
+  :type '(choice (const nil) (string :tag "color")))
 (make-obsolete-variable 'term-default-bg-color "use the face `term' instead."
                         "24.3")
 
@@ -3222,18 +3222,24 @@ See `term-prompt-regexp'."
         (let ((color
                (if term-ansi-current-reverse
                    (face-foreground
-                    (elt ansi-term-color-vector term-ansi-current-color))
+                    (elt ansi-term-color-vector term-ansi-current-color)
+                    nil 'default)
                  (face-background
-                  (elt ansi-term-color-vector term-ansi-current-bg-color)))))
+                  (elt ansi-term-color-vector term-ansi-current-bg-color)
+                  nil 'default))))
           (setq term-current-face
                 (list :background color
                       :foreground color))
           ) ;; No need to bother with anything else if it's invisible.
       (setq term-current-face
             (list :foreground
-                  (face-foreground (elt ansi-term-color-vector term-ansi-current-color))
+                  (face-foreground
+                   (elt ansi-term-color-vector term-ansi-current-color)
+                   nil 'default)
                   :background
-                  (face-background (elt ansi-term-color-vector term-ansi-current-bg-color))
+                  (face-background
+                   (elt ansi-term-color-vector term-ansi-current-bg-color)
+                   nil 'default)
                   :inverse-video term-ansi-current-reverse))
 
       (when term-ansi-current-bold
diff --git a/lisp/view.el b/lisp/view.el
index 5a28415ec7a..2717c915c71 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -461,16 +461,13 @@ then \\[View-leave], \\[View-quit] and \\[View-kill-and-leave] will return to th
 
 Entry to view-mode runs the normal hook `view-mode-hook'."
   :lighter " View" :keymap view-mode-map
-  (if view-mode (view-mode-enable) (view-mode-disable)))
+  (if view-mode (view--enable) (view--disable)))
 
-(defun view-mode-enable (&optional run-view-mode-hook)
-  "Turn on View mode.
-Run `view-mode-hook' when RUN-VIEW-MODE-HOOK is non-nil."
+(defun view--enable ()
   ;; Always leave view mode before changing major mode.
   ;; This is to guarantee that the buffer-read-only variable is restored.
-  (add-hook 'change-major-mode-hook 'view-mode-disable nil t)
-  (setq view-mode t
-        view-page-size nil
+  (add-hook 'change-major-mode-hook 'view--disable nil t)
+  (setq view-page-size nil
         view-half-page-size nil
         view-old-buffer-read-only buffer-read-only
         buffer-read-only t)
@@ -481,16 +478,18 @@ Run `view-mode-hook' when RUN-VIEW-MODE-HOOK is non-nil."
             (format "continue viewing %s"
                     (if (buffer-file-name)
                         (file-name-nondirectory (buffer-file-name))
-                      (buffer-name)))))
-  (force-mode-line-update)
-  (when run-view-mode-hook
-    (run-hooks 'view-mode-hook)))
+                      (buffer-name))))))
 
+
+(define-obsolete-function-alias 'view-mode-enable 'view-mode "24.4")
 (defun view-mode-disable ()
   "Turn off View mode."
-  (remove-hook 'change-major-mode-hook 'view-mode-disable t)
+  (declare (obsolete view-mode "24.4"))
+  (view-mode -1))
+
+(defun view--disable ()
+  (remove-hook 'change-major-mode-hook 'view--disable t)
   (and view-overlay (delete-overlay view-overlay))
-  (force-mode-line-update)
   ;; Calling toggle-read-only while View mode is enabled
   ;; sets view-read-only to t as a buffer-local variable
   ;; after exiting View mode.  That arranges that the next toggle-read-only
@@ -499,7 +498,6 @@ Run `view-mode-hook' when RUN-VIEW-MODE-HOOK is non-nil."
   ;; so that View mode stays off if toggle-read-only is called.
   (if (local-variable-p 'view-read-only)
       (kill-local-variable 'view-read-only))
-  (setq view-mode nil)
   (if (boundp 'Helper-return-blurb)
       (setq Helper-return-blurb view-old-Helper-return-blurb))
   (if buffer-read-only
@@ -562,8 +560,7 @@ This function runs the normal hook `view-mode-hook'."
     (setq view-exit-action exit-action))
 
   (unless view-mode
-    (view-mode-enable t)
-    (force-mode-line-update)
+    (view-mode 1)
     (unless view-inhibit-help-message
       (message "%s"
                (substitute-command-keys "\
@@ -590,7 +587,7 @@ current buffer. "
   (when view-mode
     (let ((buffer (window-buffer)))
       (unless view-no-disable-on-exit
-        (view-mode-disable))
+        (view-mode -1))
 
       (unless exit-only
         (cond
@@ -601,8 +598,7 @@ current buffer. "
           (quit-window)))
 
         (when exit-action
-          (funcall exit-action buffer))
-        (force-mode-line-update)))))
+          (funcall exit-action buffer))))))
 
 (defun View-exit ()
   "Exit View mode but stay in current buffer."