Minor fixes for Haiku

* lisp/frame.el (display-symbol-keys-p):
* lisp/simple.el (normal-erase-is-backspace-setup-frame): Add
support for Haiku.

diff --git a/lisp/frame.el b/lisp/frame.el
index 9c3fa9ae4bb2b0f67c2c7192efe3a3db00660236..af95a047c381bf5d5568fc47aac4a3c9b6c190f0 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2189,7 +2189,7 @@ frame's display)."
 This means that, for example, DISPLAY can differentiate between
 the keybinding RET and [return]."
   (let ((frame-type (framep-on-display display)))
-    (or (memq frame-type '(x w32 ns pc pgtk))
+    (or (memq frame-type '(x w32 ns pc pgtk haiku))
         ;; MS-DOS and MS-Windows terminals have built-in support for
         ;; function (symbol) keys
         (memq system-type '(ms-dos windows-nt)))))

diff --git a/lisp/simple.el b/lisp/simple.el
index 3f3dbe78c39e822be7511fde1b93b15e93cd80ce..aaad32179829a3e77c5c4ca5e538e68c1e20164e 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -10386,7 +10386,7 @@ call `normal-erase-is-backspace-mode' (which see) instead."
        (if (if (eq normal-erase-is-backspace 'maybe)
                (and (not noninteractive)
                     (or (memq system-type '(ms-dos windows-nt))
-                       (memq window-system '(w32 ns pgtk))
+                       (memq window-system '(w32 ns pgtk haiku))
                         (and (eq window-system 'x)
                              (fboundp 'x-backspace-delete-keys-p)
                              (x-backspace-delete-keys-p))