Mercurial > emacs
changeset 50062:b43d8c1413de
* 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.
author | Kai Großjohann <kgrossjo@eu.uu.net> |
---|---|
date | Sun, 09 Mar 2003 14:05:25 +0000 |
parents | 16f19efe98b2 |
children | 464ffd8b9e33 |
files | lisp/ChangeLog lisp/emulation/crisp.el lisp/man.el |
diffstat | 3 files changed, 29 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Mar 08 19:38:02 2003 +0000 +++ b/lisp/ChangeLog Sun Mar 09 14:05:25 2003 +0000 @@ -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.
--- a/lisp/emulation/crisp.el Sat Mar 08 19:38:02 2003 +0000 +++ b/lisp/emulation/crisp.el Sun Mar 09 14:05:25 2003 +0000 @@ -385,6 +385,12 @@ (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)
--- a/lisp/man.el Sat Mar 08 19:38:02 2003 +0000 +++ b/lisp/man.el Sun Mar 09 14:05:25 2003 +0000 @@ -623,21 +623,19 @@ (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.