[Emacs-diffs] master 9365ff0 1/2: Remove XEmacs compat code from prolog.el

[Lars Ingebrigtsen]

branch: master
commit 9365ff0527c27adb1c66e11ceee129f5e932a98d
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Remove XEmacs compat code from prolog.el
    
    * lisp/progmodes/prolog.el (prolog-mode-syntax-table)
    (prolog-help-info, prolog-Info-follow-nearest-node)
    (prolog-menu-help, prolog-edit-menu-runtime)
    (prolog-inferior-menu-all): Remove XEmacs compat code.
---
 lisp/progmodes/prolog.el | 51 ++++++++++++++----------------------------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 780eff2..4665500 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -788,15 +788,8 @@ This is really kludgy, and unneeded (i.e. obsolete) in 
Emacs>=24."
 
     (modify-syntax-entry ?% "<" table)
     (modify-syntax-entry ?\n ">" table)
-    (if (featurep 'xemacs)
-        (progn
-          (modify-syntax-entry ?* ". 67" table)
-          (modify-syntax-entry ?/ ". 58" table)
-          )
-      ;; Emacs wants to see this it seems:
-      (modify-syntax-entry ?* ". 23b" table)
-      (modify-syntax-entry ?/ ". 14" table)
-      )
+    (modify-syntax-entry ?* ". 23b" table)
+    (modify-syntax-entry ?/ ". 14" table)
     table))
 
 (defconst prolog-atom-char-regexp
@@ -2424,17 +2417,14 @@ In effect it sets the `fill-prefix' when inside 
comments and then calls
       ;; Single match
       (re-search-backward "[^ /]" nil t))
 
-    ;; (Info-follow-nearest-node (point))
-    (prolog-Info-follow-nearest-node)
+    (Info-follow-nearest-node)
     (re-search-forward (concat "^`" (regexp-quote predicate)) nil t)
     (beginning-of-line)
     (recenter 0)
     (pop-to-buffer buffer)))
 
-(defun prolog-Info-follow-nearest-node ()
-  (if (featurep 'xemacs)
-      (Info-follow-nearest-node (point))
-    (Info-follow-nearest-node)))
+(define-obsolete-function-alias 'prolog-Info-follow-nearest-node
+  #'Info-follow-nearest-node "27.1")
 
 (defun prolog-help-online (predicate)
   (prolog-ensure-process)
@@ -3337,11 +3327,7 @@ PREFIX is the prefix of the search regexp."
   prolog-menu-help (list prolog-mode-map prolog-inferior-mode-map)
   "Help menu for the Prolog mode."
   ;; FIXME: Does it really deserve a whole menu to itself?
-  `(,(if (featurep 'xemacs) "Help"
-       ;; Not sure it's worth the trouble.  --Stef
-       ;; (add-to-list 'menu-bar-final-items
-       ;;         (easy-menu-intern "Prolog-Help"))
-       "Prolog-help")
+  `("Prolog-help"
     ["On predicate" prolog-help-on-predicate prolog-help-function-i]
     ["Apropos" prolog-help-apropos (eq prolog-system 'swi)]
     "---"
@@ -3353,11 +3339,9 @@ PREFIX is the prefix of the search regexp."
   ;; FIXME: Don't use a whole menu for just "Run Mercury".  --Stef
   `("System"
     ;; Runtime menu name.
-    ,@(unless (featurep 'xemacs)
-        '(:label (cond ((eq prolog-system 'eclipse) "ECLiPSe")
-                       ((eq prolog-system 'mercury) "Mercury")
-                       (t "System"))))
-
+    :label (cond ((eq prolog-system 'eclipse) "ECLiPSe")
+                 ((eq prolog-system 'mercury) "Mercury")
+                 (t "System"))
     ;; Consult items, NIL for mercury.
     ["Consult file" prolog-consult-file
      :included (not (eq prolog-system 'mercury))]
@@ -3369,8 +3353,7 @@ PREFIX is the prefix of the search regexp."
      :included (not (eq prolog-system 'mercury))]
 
     ;; Compile items, NIL for everything but SICSTUS.
-    ,(if (featurep 'xemacs) "---"
-       ["---" nil :included (eq prolog-system 'sicstus)])
+    ["---" nil :included (eq prolog-system 'sicstus)]
     ["Compile file" prolog-compile-file
      :included (eq prolog-system 'sicstus)]
     ["Compile buffer" prolog-compile-buffer
@@ -3381,8 +3364,7 @@ PREFIX is the prefix of the search regexp."
      :included (eq prolog-system 'sicstus)]
 
     ;; Debug items, NIL for Mercury.
-    ,(if (featurep 'xemacs) "---"
-       ["---" nil :included (not (eq prolog-system 'mercury))])
+    ["---" nil :included (not (eq prolog-system 'mercury))]
     ;; FIXME: Could we use toggle or radio buttons?  --Stef
     ["Debug" prolog-debug-on :included (not (eq prolog-system 'mercury))]
     ["Debug off" prolog-debug-off
@@ -3465,14 +3447,11 @@ PREFIX is the prefix of the search regexp."
   "Menu for the inferior Prolog buffer."
   `("Prolog"
     ;; Runtime menu name.
-    ,@(unless (featurep 'xemacs)
-        '(:label (cond ((eq prolog-system 'eclipse) "ECLiPSe")
-                       ((eq prolog-system 'mercury) "Mercury")
-                       (t "Prolog"))))
-
+    :label (cond ((eq prolog-system 'eclipse) "ECLiPSe")
+                 ((eq prolog-system 'mercury) "Mercury")
+                 (t "Prolog"))
     ;; Debug items, NIL for Mercury.
-    ,(if (featurep 'xemacs) "---"
-       ["---" nil :included (not (eq prolog-system 'mercury))])
+    ["---" nil :included (not (eq prolog-system 'mercury))]
     ;; FIXME: Could we use toggle or radio buttons?  --Stef
     ["Debug" prolog-debug-on :included (not (eq prolog-system 'mercury))]
     ["Debug off" prolog-debug-off