diff options
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index fe58a47610e..cb8fcc97136 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2289,6 +2289,8 @@ the text which should be made available. The second, optional, argument PUSH, has the same meaning as the similar argument to `x-set-cut-buffer', which see.") +(make-variable-frame-local 'interprogram-cut-function) + (defvar interprogram-paste-function nil "Function to call to get text cut from other programs. @@ -2309,6 +2311,8 @@ most recent string, the function should return nil. If it is difficult to tell whether Emacs or some other program provided the current string, it is probably good enough to return nil if the string is equal (according to `string=') to the last text Emacs provided.") + +(make-variable-frame-local 'interprogram-paste-function) @@ -5181,14 +5185,14 @@ the front of the list of recently selected ones." (defcustom normal-erase-is-backspace (and (not noninteractive) (or (memq system-type '(ms-dos windows-nt)) - (eq window-system 'mac) - (and (memq window-system '(x)) + (eq initial-window-system 'mac) + (and (memq initial-window-system '(x)) (fboundp 'x-backspace-delete-keys-p) (x-backspace-delete-keys-p)) ;; If the terminal Emacs is running on has erase char ;; set to ^H, use the Backspace key for deleting ;; backward and, and the Delete key for deleting forward. - (and (null window-system) + (and (null initial-window-system) (eq tty-erase-char ?\^H)))) "If non-nil, Delete key deletes forward and Backspace key deletes backward. @@ -5266,6 +5270,7 @@ See also `normal-erase-is-backspace'." (if normal-erase-is-backspace (progn + ;; XXX Perhaps this mode should be terminal-local, not global -- lorentey (define-key function-key-map [delete] [?\C-d]) (define-key function-key-map [kp-delete] [?\C-d]) (define-key function-key-map [backspace] [?\C-?])) |