From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 9 Oct 2006 15:08:50 +0000 (+0000)
Subject: Comment change.
X-Git-Tag: emacs-pretest-22.0.90~181
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=491bf4bcf4eb49af35d1d7c91296f4584c854094;p=emacs.git

Comment change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a33039f018d..13a6270b27f 100644
--- 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 316ba0ab244..2adfc79618a 100644
--- 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)