aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-08-02 17:59:31 +0200
committerLars Magne Ingebrigtsen2011-08-02 17:59:31 +0200
commit92f2affc50fe6e47334957695abcc727339cb022 (patch)
tree9392ebe609bf58d7551c6ebb17aea7abc1c06a01
parent57d5aff0c0188c15731fa95c191c0c9ece27f943 (diff)
downloademacs-92f2affc50fe6e47334957695abcc727339cb022.tar.gz
emacs-92f2affc50fe6e47334957695abcc727339cb022.zip
(ido-mode): Switch off the message if called non-interactively.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/ido.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03c4f1dab02..b8e2b3bb5b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-08-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-08-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * ido.el (ido-mode): Switch off the message if called
4 non-interactively.
5
3 * mail/smtpmail.el (smtpmail-query-smtp-server): Try port 25 6 * mail/smtpmail.el (smtpmail-query-smtp-server): Try port 25
4 before 587, since it appears that that's more likely to work for 7 before 587, since it appears that that's more likely to work for
5 more people. 8 more people.
diff --git a/lisp/ido.el b/lisp/ido.el
index b50ddcc1254..4086000e3e9 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1557,7 +1557,8 @@ This function also adds a hook to the minibuffer."
1557 (setq ido-minor-mode-map-entry (cons 'ido-mode map)) 1557 (setq ido-minor-mode-map-entry (cons 'ido-mode map))
1558 (add-to-list 'minor-mode-map-alist ido-minor-mode-map-entry)))) 1558 (add-to-list 'minor-mode-map-alist ido-minor-mode-map-entry))))
1559 1559
1560 (message "Ido mode %s" (if ido-mode "enabled" "disabled"))) 1560 (when (called-interactively-p 'any)
1561 (message "Ido mode %s" (if ido-mode "enabled" "disabled"))))
1561 1562
1562 1563
1563;;; IDO KEYMAP 1564;;; IDO KEYMAP