summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2002-12-21 20:25:25 +0000
committerRichard M. Stallman <rms@gnu.org>2002-12-21 20:25:25 +0000
commitf0088f4de8dfd17b6a2a1bf48cb2e1a8b7d39a3c (patch)
treecabbca4c3db4a658e42d64a517bc53d2fc590f91
parent44a9ca8b7ef609ce41685ae6049c734928c9ea83 (diff)
downloademacs-f0088f4de8dfd17b6a2a1bf48cb2e1a8b7d39a3c.tar.gz
(Man-getpage-in-background): Put GROFF_NO_SGR in env.
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/man.el4
2 files changed, 18 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3dbf8d5e029..a3203789ccb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2002-12-21 Richard M. Stallman <rms@gnu.org>
+
+ * man.el (Man-getpage-in-background): Put GROFF_NO_SGR in env.
+
+ * ls-lisp.el (original-insert-directory): Make this a variable,
+ don't set its function definition.
+ (insert-directory): Use funcall to call that function.
+
+ * bindings.el (help-echo): Change tooltip string.
+
+ * chistory.el (command-history-map): Move definition up.
+
+ * faces.el (help-xref-stack): Add defvar to avoid warning.
+
2002-12-21 Andreas Schwab <schwab@suse.de>
* dired.el (dired-insert-directory): Preserve text properties
@@ -4963,12 +4977,11 @@
* dired.el: Hide disabling of dired-find-alternate-file behind
autoload-cookie.
-2002-07-31 Juanma Barranquero <lektu@terra.es>
+2002-07-31 Tak Ota <Takaaki.Ota@am.sony.com> (tiny change)
* makefile.w32-in: Revert some changes from 2002-07-23 because they
don't work on MSVC/nmake builds.
(update-subdirs-CMD): Generate the right list of subdirectories.
- From Tak Ota <Takaaki.Ota@am.sony.com>.
2002-07-30 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
diff --git a/lisp/man.el b/lisp/man.el
index c5a5acd1282..855565242e2 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -618,7 +618,9 @@ all sections related to a subject, put something appropriate into the
(start-process manual-program buffer "sh" "-c"
(format (Man-build-man-command) man-args))
'Man-bgproc-sentinel)
- (progn
+ (let ((process-environment
+ (cons "GROFF_NO_SGR=1" process-environment)))
+
(let ((exit-status
(call-process shell-file-name nil (list buffer nil) nil "-c"
(format (Man-build-man-command) man-args)))