Comment change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a33039f018d08f49f0aaf50d5fccfd2c30f513aa..13a6270b27f52404a6832c1b5a58323b2512e34c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-09  Richard Stallman  <rms@gnu.org>
+
+       * textmodes/two-column.el (2C-two-columns): Doc fix.
+
 2006-10-09  Kim F. Storm  <storm@cua.dk>
 
        * shell.el (explicit-csh-args, explicit-bash-args): Add comment

diff --git a/lisp/shell.el b/lisp/shell.el
index 316ba0ab2443c90d11a6d1d78291375793e6f5f3..2adfc79618a9abac5547f0f39f28e749c3537f0d 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -288,11 +288,12 @@ Value is a list of strings, which may be nil."
 ;; Note: There are no explicit references to the variable `explicit-bash-args'.
 ;; It is used implicitly by M-x shell when the interactive shell is `bash'.
 (defcustom explicit-bash-args
-  ;; Tell bash not to use readline, except for bash 1.x which doesn't grook --noediting.
-  ;; Bash 1.x has -nolineediting, but process-send-eof cannot terminate bash if we use it.
   (let* ((prog (or (and (boundp 'explicit-shell-file-name) explicit-shell-file-name)
                   (getenv "ESHELL") shell-file-name))
         (name (file-name-nondirectory prog)))
+    ;; Tell bash not to use readline, except for bash 1.x which
+    ;; doesn't grook --noediting.  Bash 1.x has -nolineediting, but
+    ;; process-send-eof cannot terminate bash if we use it.
     (if (and (not purify-flag)
             (equal name "bash")
             (file-executable-p prog)