aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPo Lu2023-01-22 08:37:06 +0800
committerPo Lu2023-01-22 08:37:06 +0800
commit89cb3c3f1576fdc69eb061cccc8b537f4b7c8228 (patch)
tree6aae52fd157db91c34edd6be097de25880255ac6
parent6adc193ad66445acd84caba6973424ecbd21da26 (diff)
downloademacs-89cb3c3f1576fdc69eb061cccc8b537f4b7c8228.tar.gz
emacs-89cb3c3f1576fdc69eb061cccc8b537f4b7c8228.zip
Minor fixes for Haiku
* lisp/frame.el (display-symbol-keys-p): * lisp/simple.el (normal-erase-is-backspace-setup-frame): Add support for Haiku.
-rw-r--r--lisp/frame.el2
-rw-r--r--lisp/simple.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 9c3fa9ae4bb..af95a047c38 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2189,7 +2189,7 @@ frame's display)."
2189This means that, for example, DISPLAY can differentiate between 2189This means that, for example, DISPLAY can differentiate between
2190the keybinding RET and [return]." 2190the keybinding RET and [return]."
2191 (let ((frame-type (framep-on-display display))) 2191 (let ((frame-type (framep-on-display display)))
2192 (or (memq frame-type '(x w32 ns pc pgtk)) 2192 (or (memq frame-type '(x w32 ns pc pgtk haiku))
2193 ;; MS-DOS and MS-Windows terminals have built-in support for 2193 ;; MS-DOS and MS-Windows terminals have built-in support for
2194 ;; function (symbol) keys 2194 ;; function (symbol) keys
2195 (memq system-type '(ms-dos windows-nt))))) 2195 (memq system-type '(ms-dos windows-nt)))))
diff --git a/lisp/simple.el b/lisp/simple.el
index 3f3dbe78c39..aaad3217982 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -10386,7 +10386,7 @@ call `normal-erase-is-backspace-mode' (which see) instead."
10386 (if (if (eq normal-erase-is-backspace 'maybe) 10386 (if (if (eq normal-erase-is-backspace 'maybe)
10387 (and (not noninteractive) 10387 (and (not noninteractive)
10388 (or (memq system-type '(ms-dos windows-nt)) 10388 (or (memq system-type '(ms-dos windows-nt))
10389 (memq window-system '(w32 ns pgtk)) 10389 (memq window-system '(w32 ns pgtk haiku))
10390 (and (eq window-system 'x) 10390 (and (eq window-system 'x)
10391 (fboundp 'x-backspace-delete-keys-p) 10391 (fboundp 'x-backspace-delete-keys-p)
10392 (x-backspace-delete-keys-p)) 10392 (x-backspace-delete-keys-p))