Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-266
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-267
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-268
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-269
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-270
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-271
   Rename "field-at-point" to "field-at-pos"

 * emacs@sv.gnu.org/emacs--devo--0--patch-272
   (comint-insert-input): Remove redundant calls to setq and goto-char

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-556

1 files changed, 1 insertions, 1 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 015c4c6f171..7835c56c3e2 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -858,7 +858,7 @@ so don't mark these buffers specially, just visit them normally."
         ;; deleted file, offer to write it.
         (let* ((filen (car file))
                (obuf (get-file-buffer filen)))
-          (push filen file-name-history)
+          (add-to-history 'file-name-history filen)
           (if (and obuf (set-buffer obuf))
               (progn
                 (cond ((file-exists-p filen)