* 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 eb2041f1cae62c8b92b4f276163444cf74171237..312c2c0165a5e6d65664d86504be0bc10e6a494d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-09  Kai Gro\e,A_\e(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 8a5410d48a74c1ae3d1f50b2a5751a372a7900f8..055c8e58de0a27a1c9fe5c0c61e1ecdc9882e18f 100644 (file)
--- 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 cd44b68011755ffb12d6c805fc3fed95ab505acf..e641823a7e55f08146de83b2c88ec7e4c0cd9018 100644 (file)
--- 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.