From: Kai Großjohann <kgrossjo@eu.uu.net>
Date: Sun, 9 Mar 2003 14:05:25 +0000 (+0000)
Subject: * man.el (Man-getpage-in-background): Always use `setenv' for
X-Git-Tag: ttn-vms-21-2-B4~10963
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=504feff52552ef480c3f0a50b9d82570ca753727;p=emacs.git

* man.el (Man-getpage-in-background): Always use `setenv' for
environment variables, instead of modifying process-environment
directly.  The previous version let-bound process-environment --
the let-binding is skipped for GROFF_NO_SGR because there is
already a let-binding in effect in some outer scope.

* emulation/crisp.el (top-level): Interoperate with cua.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb2041f1cae..312c2c0165a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-09  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
+
+	* man.el (Man-getpage-in-background): Always use `setenv' for
+	environment variables, instead of modifying process-environment
+	directly.  The previous version let-bound process-environment --
+	the let-binding is skipped for GROFF_NO_SGR because there is
+	already a let-binding in effect in some outer scope.
+
+	* emulation/crisp.el (top-level): Interoperate with cua.
+
 2003-03-08  Kim F. Storm  <storm@cua.dk>
 
 	* emulation/cua-base.el: Provide `cua' feature.
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index 8a5410d48a7..055c8e58de0 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -385,6 +385,12 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise."
       (setq minor-mode-map-alist (cons (cons 'crisp-mode crisp-mode-map)
 				       minor-mode-map-alist))))
 
+;; Interaction with other packages.
+(eval-after-load 'cua
+  (progn
+    (add-to-list 'cua--standard-movement-commands 'crisp-home)
+    (add-to-list 'cua--standard-movement-commands 'crisp-end)))
+
 (run-hooks 'crisp-load-hook)
 (provide 'crisp)
 
diff --git a/lisp/man.el b/lisp/man.el
index cd44b680117..e641823a7e5 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -623,21 +623,19 @@ 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)
-	  (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)))
-		  (msg ""))
-	      (or (and (numberp exit-status)
-		       (= exit-status 0))
-		  (and (numberp exit-status)
-		       (setq msg
-			     (format "exited abnormally with code %d"
-				     exit-status)))
-		  (setq msg exit-status))
-	      (Man-bgproc-sentinel bufname msg))))))))
+	  (setenv "GROFF_NO_SGR" "1")
+	  (let ((exit-status
+		 (call-process shell-file-name nil (list buffer nil) nil "-c"
+			       (format (Man-build-man-command) man-args)))
+		(msg ""))
+	    (or (and (numberp exit-status)
+		     (= exit-status 0))
+		(and (numberp exit-status)
+		     (setq msg
+			   (format "exited abnormally with code %d"
+				   exit-status)))
+		(setq msg exit-status))
+	    (Man-bgproc-sentinel bufname msg)))))))
 
 (defun Man-notify-when-ready (man-buffer)
   "Notify the user when MAN-BUFFER is ready.