diff options
author | Stefan Kangas <stefan@marxist.se> | 2021-03-20 01:16:26 +0100 |
---|---|---|
committer | Stefan Kangas <stefan@marxist.se> | 2021-03-20 01:26:21 +0100 |
commit | 0eeb865aae3373343c18b7674fde91f280edafef (patch) | |
tree | 77357b89a099ed9215fed815da820cef56548d48 | |
parent | 7607d1c4e854cf55701aef3446092d3f510697ce (diff) | |
download | emacs-0eeb865aae3373343c18b7674fde91f280edafef.tar.gz |
Assume something more recent than X11R6
* lisp/bindings.el:
* lisp/menu-bar.el:
* lisp/printing.el:
* lisp/thumbs.el (thumbs-conversion-program): Assume we have something
more recent than X11R6.
-rw-r--r-- | lisp/bindings.el | 2 | ||||
-rw-r--r-- | lisp/menu-bar.el | 2 | ||||
-rw-r--r-- | lisp/printing.el | 4 | ||||
-rw-r--r-- | lisp/thumbs.el | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el index a502373997a..6eac528eb61 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1211,7 +1211,7 @@ if `inhibit-field-text-motion' is non-nil." ;; (define-key global-map [kp-9] 'function-key-error) ;; (define-key global-map [kp-equal] 'function-key-error) -;; X11R6 distinguishes these keys from the non-kp keys. +;; X11 distinguishes these keys from the non-kp keys. ;; Make them behave like the non-kp keys unless otherwise bound. ;; FIXME: rather than list such mappings for every modifier-combination, ;; we should come up with a way to do it generically, something like diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 133df65cbcb..e6cce593430 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -604,7 +604,7 @@ Do the same for the keys of the same name." (define-key global-map [f20] 'clipboard-kill-region) (define-key global-map [f16] 'clipboard-kill-ring-save) (define-key global-map [f18] 'clipboard-yank) - ;; X11R6 versions: + ;; X11 versions: (define-key global-map [cut] 'clipboard-kill-region) (define-key global-map [copy] 'clipboard-kill-ring-save) (define-key global-map [paste] 'clipboard-yank)) diff --git a/lisp/printing.el b/lisp/printing.el index f6b9494e177..f5d3c82ae95 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -103,14 +103,14 @@ Please send all bug fixes and enhancements to ;; For example, after previewing a PostScript file, *Printing Command Output* ;; will have the following entry: ;; -;; /usr/X11R6/bin/gv ("/home/user/example/file.ps") +;; /usr/bin/gv ("/home/user/example/file.ps") ;; Exit status: 0 ;; ;; In the example above, the previewing was successful. If during previewing, ;; you quit gv execution (by typing C-g during Emacs session), the log entry ;; would be: ;; -;; /usr/X11R6/bin/gv ("/home/user/example/file.ps") +;; /usr/bin/gv ("/home/user/example/file.ps") ;; Exit status: Quit ;; ;; So, if something goes wrong, a good place to take a look is the buffer diff --git a/lisp/thumbs.el b/lisp/thumbs.el index c6a9a67b3f3..8d79ceda5b8 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -95,10 +95,11 @@ When it reaches that size (in bytes), a warning is sent." (if (eq system-type 'windows-nt) "convert.exe" (or (executable-find "convert") - "/usr/X11R6/bin/convert")) + "/usr/bin/convert")) "Name of conversion program for thumbnails generation. It must be \"convert\"." - :type 'string) + :type 'string + :version "28.1") (defcustom thumbs-setroot-command "xloadimage -onroot -fullscreen *" |