Merge from emacs--devo--0

[gnu-emacs] / lisp / term / news.el

diff --git a/lisp/term/news.el b/lisp/term/news.el
index 57d8fd6cb1478825e9855f77337f80e342cd2edb..514f363314da8708531214e86c50955364fe296e 100644 (file)
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -31,10 +31,8 @@
 
 (defun terminal-init-news ()
   "Terminal initialization function for news."
-  (if (boundp 'news-fkey-prefix)
-      nil
-    ;; The terminal initialization should already have set up some keys
-    (setq news-fkey-prefix (lookup-key function-key-map "\eO"))
+  ;; The terminal initialization should already have set up some keys
+  (let ((news-fkey-prefix (lookup-key local-function-key-map "\eO")))
     (if (not (keymapp news-fkey-prefix))
        (error "What?  Your news termcap/terminfo has no keycaps in it"))