Merge pull request #1411 from bbatsov/drop-legacy-code

Drop some legacy Emacs compatibility code

1 files changed, 108 insertions, 328 deletions

diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 5dff4e6e2f..2d86eb44d4 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -97,18 +97,6 @@ Erlang mode menu."
   :type '(restricted-sexp :match-alternatives (stringp 'nil))
   :safe (lambda (val) (or (eq nil val) (stringp val))))
 
-(defconst erlang-xemacs-p (string-match "Lucid\\|XEmacs" emacs-version)
-  "Non-nil when running under XEmacs or Lucid Emacs.")
-
-(defvar erlang-xemacs-popup-menu '("Erlang Mode Commands" . nil)
-  "Common popup menu for all buffers in Erlang mode.
-
-This variable is destructively modified every time the Erlang menu
-is modified.  The effect is that all changes take effect in all
-buffers in Erlang mode, just like under GNU Emacs.
-
-Never EVER set this variable!")
-
 (defvar erlang-menu-items '(erlang-menu-base-items
                             erlang-menu-skel-items
                             erlang-menu-shell-items
@@ -128,17 +116,14 @@ variable.")
 (defvar erlang-menu-base-items
   '(("Indent"
      (("Indent Line" erlang-indent-command)
-      ("Indent Region " erlang-indent-region
-       (if erlang-xemacs-p (mark) mark-active))
+      ("Indent Region " erlang-indent-region mark-active)
       ("Indent Clause" erlang-indent-clause)
       ("Indent Function" erlang-indent-function)
       ("Indent Buffer" erlang-indent-current-buffer)))
     ("Edit"
      (("Fill Comment" erlang-fill-paragraph)
-      ("Comment Region" comment-region
-       (if erlang-xemacs-p (mark) mark-active))
-      ("Uncomment Region" erlang-uncomment-region
-       (if erlang-xemacs-p (mark) mark-active))
+      ("Comment Region" comment-region mark-active)
+      ("Uncomment Region" uncomment-region mark-active)
       nil
       ("Beginning of Function" erlang-beginning-of-function)
       ("End of Function" erlang-end-of-function)
@@ -576,8 +561,7 @@ This is an elisp list of options. Each option can be either:
 - a string")
 
 (eval-and-compile
-  (defvar erlang-regexp-modern-p
-    (if (> emacs-major-version 21) t nil)
+  (defvar erlang-regexp-modern-p t
     "Non-nil when this version of Emacs uses a modern version of regexp.
 Supporting \_< and \_> This is determined by checking the version of Emacs used."))
 
@@ -1055,8 +1039,7 @@ behaviour.")
     (define-key map "\M-q"      'erlang-fill-paragraph)
     (unless (boundp 'beginning-of-defun-function)
       (define-key map "\M-\C-a"   'erlang-beginning-of-function)
-      (define-key map "\M-\C-e"   'erlang-end-of-function)
-      (define-key map '(meta control h)   'erlang-mark-function))       ; Xemacs
+      (define-key map "\M-\C-e"   'erlang-end-of-function))
     (define-key map "\M-\t"     'erlang-complete-tag)
     (define-key map "\C-c\M-\t" 'tempo-complete-tag)
     (define-key map "\M-+"      'erlang-find-next-tag)
@@ -1071,7 +1054,7 @@ behaviour.")
     (define-key map "\C-c\C-l"  'erlang-compile-display)
     (define-key map "\C-c\C-s"  'erlang-show-syntactic-information)
     (define-key map "\C-c\C-q"  'erlang-indent-function)
-    (define-key map "\C-c\C-u"  'erlang-uncomment-region)
+    (define-key map "\C-c\C-u"  'uncomment-region)
     (define-key map "\C-c\C-y"  'erlang-clone-arguments)
     (define-key map "\C-c\C-a"  'erlang-align-arrows)
     (define-key map "\C-c\C-z"  'erlang-shell-display)
@@ -1114,12 +1097,7 @@ behaviour.")
   "Font lock keyword highlighting a function header.")
 
 (defface erlang-font-lock-exported-function-name-face
-  (if (featurep 'xemacs)
-      (progn
-        (require 'font-lock)
-        `((t (:foreground ,(face-foreground 'font-lock-function-name-face))
-             (:background ,(face-background 'font-lock-function-name-face)))))
-    '((default (:inherit font-lock-function-name-face))))
+  '((default (:inherit font-lock-function-name-face)))
   "Face used for highlighting exported functions."
   :group 'erlang)
 
@@ -1331,11 +1309,7 @@ Example:
 
 The difference between this and the standard Erlang Mode
 syntax table is that `_' is treated as part of words by
-this syntax table.
-
-Unfortunately, XEmacs hasn't got support for a special Font
-Lock syntax table.  The effect is that `apply' in the atom
-`foo_apply' will be highlighted as a bif.")
+this syntax table.")
 
 (defvar erlang-replace-etags-tags-completion-table nil
   "Internal flag used by advice `erlang-replace-tags-table'.
@@ -1355,18 +1329,9 @@ replaced by `erlang-etags-tags-completion-table'.")
   (defvar next-error-last-buffer))
 
 (eval-when-compile
-  (if (or (featurep 'bytecomp)
-          (featurep 'byte-compile))
-      (progn
-        (cond ((string-match "Lucid\\|XEmacs" emacs-version)
-               (put 'comment-indent-hook 'byte-obsolete-variable nil)
-               ;; Do not warn for unused variables
-               ;; when compiling under XEmacs.
-               (setq byte-compile-warnings
-                     '(free-vars unresolved callargs redefine))))
-        (require 'comint)
-        (require 'tempo)
-        (require 'compile))))
+  (require 'comint)
+  (require 'tempo)
+  (require 'compile))
 
 
 (defun erlang-version ()
@@ -1448,8 +1413,7 @@ Other commands:
   (erlang-tags-init)
   (erlang-font-lock-init)
   (erlang-skel-init)
-  (when (fboundp 'tempo-use-tag-list)
-    (tempo-use-tag-list 'erlang-tempo-tags))
+  (tempo-use-tag-list 'erlang-tempo-tags)
   (when (and (fboundp 'add-function) (fboundp 'erldoc-eldoc-function))
     (or eldoc-documentation-function
         (setq-local eldoc-documentation-function #'ignore))
@@ -1508,8 +1472,7 @@ Other commands:
   ;; delsel/pending-del mode. Also, set up text properties for bit
   ;; syntax handling.
   (mapc #'(lambda (cmd)
-            (put cmd 'delete-selection t) ;for delsel (Emacs)
-            (put cmd 'pending-delete t)) ;for pending-del (XEmacs)
+            (put cmd 'delete-selection t)) ;for delsel (Emacs)
         '(erlang-electric-semicolon
           erlang-electric-comma
           erlang-electric-gt))
@@ -1547,8 +1510,6 @@ Other commands:
   (make-local-variable 'indent-region-function)
   (setq indent-region-function 'erlang-indent-region)
   (set (make-local-variable 'comment-indent-function) 'erlang-comment-indent)
-  (if (<= emacs-major-version 18)
-      (set (make-local-variable 'comment-indent-hook) 'erlang-comment-indent))
   (set (make-local-variable 'parse-sexp-ignore-comments) t)
   (set (make-local-variable 'dabbrev-case-fold-search) nil)
   (set (make-local-variable 'imenu-prev-index-position-function)
@@ -1755,7 +1716,7 @@ menu configuration is changed."
 
 
 (defun erlang-menu-install (name items keymap &optional popup)
-  "Install a menu in Emacs or XEmacs based on an abstract description.
+  "Install a menu in Emacs based on an abstract description.
 
 NAME is the name of the menu.
 
@@ -1766,32 +1727,15 @@ same same form as ITEMS.  The third optional element is an expression
 which is evaluated every time the menu is displayed.  Should the
 expression evaluate to nil the menu item is ghosted.
 
-KEYMAP is the keymap to add to menu to.  (When using XEmacs, the menu
-will only be visible when this menu is the global, the local, or an
-activate minor mode keymap.)
-
-If POPUP is non-nil, the menu is bound to the XEmacs `mode-popup-menu'
-variable, i.e. it will popup when pressing the right mouse button.
+KEYMAP is the keymap to add to menu to.
 
 Please see the variable `erlang-menu-base-items'."
-  (cond (erlang-xemacs-p
-         (let ((menu (erlang-menu-xemacs name items keymap)))
-           ;; We add the menu to the global menubar.
-           ;;(funcall (symbol-function 'set-buffer-menubar)
-           ;;         (symbol-value 'current-menubar))
-           (funcall (symbol-function 'add-submenu) nil menu)
-           (setcdr erlang-xemacs-popup-menu (cdr menu))
-           (if (and popup (boundp 'mode-popup-menu))
-               (funcall (symbol-function 'set)
-                        'mode-popup-menu erlang-xemacs-popup-menu))))
-        ((>= emacs-major-version 19)
-         (define-key keymap (vector 'menu-bar (intern name))
-           (erlang-menu-make-keymap name items)))
-        (t nil)))
+  (define-key keymap (vector 'menu-bar (intern name))
+    (erlang-menu-make-keymap name items)))
 
 
 (defun erlang-menu-make-keymap (name items)
-  "Build a menu for Emacs 19."
+  "Build a menu."
   (let ((menumap (funcall (symbol-function 'make-sparse-keymap)
                           name))
         (count 0)
@@ -1829,54 +1773,6 @@ Please see the variable `erlang-menu-base-items'."
       (setq items (cdr items)))
     (cons name menumap)))
 
-
-(defun erlang-menu-xemacs (name items &optional keymap)
-  "Build a menu for XEmacs."
-  (let ((res '())
-        first second third entry)
-    (while items
-      ;; Replace any occurrence of atoms by their value.
-      (while (and items (atom (car items)) (not (null (car items))))
-        (if (and (boundp (car items))
-                 (listp (symbol-value (car items))))
-            (setq items (append (reverse (symbol-value (car items)))
-                                (cdr items)))
-          (setq items (cdr items))))
-      (setq first (car-safe (car items)))
-      (setq second (car-safe (cdr-safe (car items))))
-      (setq third (car-safe (cdr-safe (cdr-safe (car items)))))
-      (cond ((null first)
-             (setq res (cons "------" res)))
-            ((symbolp second)
-             (setq res (cons (vector first second (or third t)) res)))
-            ((and (consp second) (eq (car second) 'lambda))
-             (setq res (cons (vector first (list 'call-interactively second)
-                                     (or third t)) res)))
-            (t
-             (setq res (cons (cons first
-                                   (cdr (erlang-menu-xemacs
-                                         first second)))
-                             res))))
-      (setq items (cdr items)))
-    (setq res (reverse res))
-    ;; When adding a menu to a minor-mode keymap under Emacs,
-    ;; it disappears when the mode is disabled.  The expression
-    ;; generated below imitates this behaviour.
-    ;; (This could be expressed much clearer using backquotes,
-    ;; but I don't want to pull in every package.)
-    (if keymap
-        (let ((expr (list 'or
-                          (list 'eq keymap 'global-map)
-                          (list 'eq keymap (list 'current-local-map))
-                          (list 'symbol-value
-                                (list 'car-safe
-                                      (list 'rassq
-                                            keymap
-                                            'minor-mode-map-alist))))))
-          (setq res (cons ':included (cons expr res)))))
-    (cons name res)))
-
-
 (defun erlang-menu-substitute (items alist)
   "Substitute functions in menu described by ITEMS.
 
@@ -2280,7 +2176,7 @@ mode with the command `M-x erlang-mode RET'.")))
 ;; Skeleton code:
 
 ;; This code is based on the package `tempo' which is part of modern
-;; Emacsen.  (GNU Emacs 19.25 (?) and XEmacs 19.14.)
+;; Emacsen.
 
 (defvar erlang-skel)
 (defun erlang-skel-init ()
@@ -2291,36 +2187,33 @@ all skeletons.
 The skeleton routines are based on the `tempo' package.  Should this
 package not be present, this function does nothing."
   (interactive)
-  (condition-case nil
-      (require 'tempo)
-    (error t))
-  (if (featurep 'tempo)
-      (let ((skel erlang-skel)
-            (menu '()))
-        (while skel
-          (cond ((null (car skel))
-                 (setq menu (cons nil menu)))
-                (t
-                 (funcall (symbol-function 'tempo-define-template)
-                          (concat "erlang-" (nth 1 (car skel)))
-                          ;; The tempo template used contains an `include'
-                          ;; function call only, hence changes to the
-                          ;; variables describing the templates take effect
-                          ;; immdiately.
-                          (list (list 'erlang-skel-include (nth 2 (car skel))))
-                          (nth 1 (car skel))
-                          (car (car skel))
-                          'erlang-tempo-tags)
-                 (setq menu (cons (erlang-skel-make-menu-item
-                                   (car skel)) menu))))
-          (setq skel (cdr skel)))
-        (setq erlang-menu-skel-items
-              (list nil (list "Skeletons" (nreverse menu))))
-        (setq erlang-menu-items
-              (erlang-menu-add-above 'erlang-menu-skel-items
-                                     'erlang-menu-version-items
-                                     erlang-menu-items))
-        (erlang-menu-init))))
+  (require 'tempo)
+  (let ((skel erlang-skel)
+        (menu '()))
+    (while skel
+      (cond ((null (car skel))
+             (setq menu (cons nil menu)))
+            (t
+             (funcall (symbol-function 'tempo-define-template)
+                      (concat "erlang-" (nth 1 (car skel)))
+                      ;; The tempo template used contains an `include'
+                      ;; function call only, hence changes to the
+                      ;; variables describing the templates take effect
+                      ;; immediately.
+                      (list (list 'erlang-skel-include (nth 2 (car skel))))
+                      (nth 1 (car skel))
+                      (car (car skel))
+                      'erlang-tempo-tags)
+             (setq menu (cons (erlang-skel-make-menu-item
+                               (car skel)) menu))))
+      (setq skel (cdr skel)))
+    (setq erlang-menu-skel-items
+          (list nil (list "Skeletons" (nreverse menu))))
+    (setq erlang-menu-items
+          (erlang-menu-add-above 'erlang-menu-skel-items
+                                 'erlang-menu-version-items
+                                 erlang-menu-items))
+    (erlang-menu-init)))
 
 (defun erlang-skel-make-menu-item (skel)
   (let ((func (intern (concat "tempo-template-erlang-" (nth 1 skel)))))
@@ -3265,11 +3158,8 @@ With argument, do this that many times."
   (interactive)
   (push-mark (point))
   (erlang-end-of-clause 1)
-  ;; Sets the region. In Emacs 19 and XEmacs, we want to activate
-  ;; the region.
-  (condition-case nil
-      (push-mark (point) nil t)
-    (error (push-mark (point))))
+  ;; Sets the region.
+  (push-mark (point) nil t)
   (erlang-beginning-of-clause 1)
   ;; The above function deactivates the mark.
   (if (boundp 'deactivate-mark)
@@ -3377,11 +3267,8 @@ With negative argument go towards the beginning of the buffer."
       (interactive)
       (push-mark (point))
       (erlang-end-of-function 1)
-      ;; Sets the region. In Emacs 19 and XEmacs, we want to activate
-      ;; the region.
-      (condition-case nil
-          (push-mark (point) nil t)
-        (error (push-mark (point))))
+      ;; Sets the region.
+      (push-mark (point) nil t)
       (erlang-beginning-of-function 1)
       ;; The above function deactivates the mark.
       (if (boundp 'deactivate-mark)
@@ -3464,13 +3351,6 @@ and initial `%':s."
               (fill-prefix comment-fill-prefix))
           (fill-paragraph justify))))))
 
-
-(defun erlang-uncomment-region (beg end)
-  "Uncomment all commented lines in the region."
-  (interactive "r")
-  (uncomment-region beg end))
-
-
 (defun erlang-generate-new-clause ()
   "Create additional Erlang clause header.
 
@@ -3919,9 +3799,9 @@ of arguments could be found, otherwise nil."
     (if (and (stringp str)
              (not (string-match (eval-when-compile
                                   (concat "\\`" erlang-atom-regexp "\\'")) str)))
-        (progn (if (fboundp 'replace-regexp-in-string)
-                   (setq str (replace-regexp-in-string "'" "\\'" str t t )))
-               (concat "'" str "'"))
+        (progn
+          (setq str (replace-regexp-in-string "'" "\\'" str t t ))
+          (concat "'" str "'"))
       str)))
 
 
@@ -4316,9 +4196,7 @@ context, nil is returned."
     (let* ((lim (or lim (save-excursion
                           (erlang-beginning-of-clause)
                           (point))))
-           (state (if (fboundp 'syntax-ppss) ; post Emacs 21.3
-                      (funcall (symbol-function 'syntax-ppss))
-                    (parse-partial-sexp lim (point)))))
+           (state (funcall (symbol-function 'syntax-ppss))))
       (cond
        ((eq (nth 3 state) ?') 'atom)
        ((nth 3 state) 'string)
@@ -4428,14 +4306,8 @@ This function is designed to be a member of a criteria list."
 
 ;;; Erlang tags support which is aware of erlang modules.
 
-;; Not yet implemented under XEmacs.  (Hint:  The Emacs 19 etags
-;; package works under XEmacs.)
-
 (eval-when-compile
-  (if (or (featurep 'bytecomp)
-          (featurep 'byte-compile))
-      (progn
-        (require 'etags))))
+  (require 'etags))
 
 
 ;; Variables:
@@ -4479,28 +4351,16 @@ After calling this function, the tags functions are aware of
 Erlang modules.  Tags can be entered on the for `module:tag' as well
 as on the old form `tag'.
 
-In the completion list, `module:tag' and `module:' shows up.
-
-This function only works under Emacs 18 and Emacs 19.  Currently, It
-is not implemented under XEmacs.  (Hint: The Emacs 19 etags module
-works under XEmacs.)"
+In the completion list, `module:tag' and `module:' shows up."
   (interactive)
-  (cond ((= emacs-major-version 18)
-         (require 'tags)
-         (erlang-tags-define-keys (current-local-map))
-         (setq erlang-tags-installed t))
-        (t
-         (require 'etags)
-         (set (make-local-variable 'find-tag-default-function)
-              'erlang-find-tag-for-completion)
-         (if (>= emacs-major-version 25)
-             (add-hook 'xref-backend-functions
-                       #'erlang-etags--xref-backend nil t)
-           ;; Test on a function available in the Emacs 19 version
-           ;; of tags but not in the XEmacs version.
-           (when (fboundp 'find-tag-noselect)
-             (erlang-tags-define-keys (current-local-map))
-             (setq erlang-tags-installed t))))))
+  (require 'etags)
+  (set (make-local-variable 'find-tag-default-function)
+       'erlang-find-tag-for-completion)
+  (if (>= emacs-major-version 25)
+      (add-hook 'xref-backend-functions
+                #'erlang-etags--xref-backend nil t)
+    (erlang-tags-define-keys (current-local-map))
+    (setq erlang-tags-installed t)))
 
 
 
@@ -4637,8 +4497,7 @@ Tags can be given on the forms `tag', `module:', `module:tag'."
         (while (null file)
           (or erlang-tags-file-list
               (save-excursion
-                (if (and (featurep 'etags)
-                         (funcall
+                (if (and (funcall
                           (symbol-function 'visit-tags-table-buffer) 'same)
                          (funcall
                           (symbol-function 'visit-tags-table-buffer) t))
@@ -4657,35 +4516,12 @@ Tags can be given on the forms `tag', `module:', `module:tag'."
                         (find-file-noselect file)))))
 
      ((string-match ":" modtagname)
-      (if (boundp 'find-tag-tag-order)
-          ;; Method one: Add module-recognising functions to the
-          ;; list of order functions.  However, the tags system
-          ;; from Emacs 18, and derives thereof (read: XEmacs)
-          ;; hasn't got this feature.
-          (progn
-            (erlang-tags-install-module-check)
-            (unwind-protect
-                (funcall (symbol-function 'find-tag)
-                         modtagname next-p regexp-p)
-              (erlang-tags-remove-module-check)))
-        ;; Method two: Call the tags system until a file matching
-        ;; the module is found.  This could result in that many
-        ;; files are read. (e.g. The tag "foo:file" will take a
-        ;; while to process.)
-        (let* ((modname (substring modtagname 0 (match-beginning 0)))
-               (tagname (substring modtagname (match-end 0) nil))
-               (last-tag tagname)
-               file)
-          (while
-              (progn
-                (funcall (symbol-function 'find-tag) tagname next-p regexp-p)
-                (setq next-p t)
-                ;; Determine the module form the file name.  (The
-                ;; alternative, to check `-module', would make this
-                ;; code useless for non-Erlang programs.)
-                (setq file (erlang-get-module-from-file-name buffer-file-name))
-                (not (and (stringp file)
-                          (string= modname file))))))))
+      (progn
+        (erlang-tags-install-module-check)
+        (unwind-protect
+            (funcall (symbol-function 'find-tag)
+                     modtagname next-p regexp-p)
+          (erlang-tags-remove-module-check))))
      (t
       (funcall (symbol-function 'find-tag) modtagname next-p regexp-p)))
     (current-buffer)))                  ; Return the new buffer.
@@ -4715,9 +4551,7 @@ Tags can be given on the forms `tag', `module:', `module:tag'."
            (prompt (if default
                        (format "%s(default %s) " prompt default)
                      prompt))
-           (spec (if (featurep 'etags)
-                     (completing-read prompt 'erlang-tags-complete-tag)
-                   (read-string prompt))))
+           (spec (completing-read prompt 'erlang-tags-complete-tag)))
       (list (if (equal spec "")
                 (or default (error "There is no default tag"))
               spec)))))
@@ -4734,23 +4568,12 @@ Tags can be given on the forms `tag', `module:', `module:tag'."
   "Install our own tag search functions."
   ;; Make sure our functions are installed in TAGS files loaded
   ;; into Emacs while searching.
-  (cond
-   ((>= emacs-major-version 20)
-    (setq erlang-tags-orig-format-functions
-          (symbol-value 'tags-table-format-functions))
-    (funcall (symbol-function 'set) 'tags-table-format-functions
-             (cons 'erlang-tags-recognize-tags-table
-                   erlang-tags-orig-format-functions))
-    (setq erlang-tags-buffer-list '())
-    )
-   (t
-    (setq erlang-tags-orig-format-hooks
-          (symbol-value 'tags-table-format-hooks))
-    (funcall (symbol-function 'set) 'tags-table-format-hooks
-             (cons 'erlang-tags-recognize-tags-table
-                   erlang-tags-orig-format-hooks))
-    (setq erlang-tags-buffer-list '())
-    ))
+  (setq erlang-tags-orig-format-functions
+        (symbol-value 'tags-table-format-functions))
+  (funcall (symbol-function 'set) 'tags-table-format-functions
+           (cons 'erlang-tags-recognize-tags-table
+                 erlang-tags-orig-format-functions))
+  (setq erlang-tags-buffer-list '())
 
   ;; Install our functions in the TAGS files already resident.
   (save-excursion
@@ -4812,17 +4635,9 @@ Tags can be given on the forms `tag', `module:', `module:tag'."
 
 (defun erlang-tags-remove-module-check ()
   "Remove our own tags search functions."
-  (cond
-   ((>= emacs-major-version 20)
-    (funcall (symbol-function 'set)
-             'tags-table-format-functions
-             erlang-tags-orig-format-functions)
-    )
-   (t
-    (funcall (symbol-function 'set)
-             'tags-table-format-hooks
-             erlang-tags-orig-format-hooks)
-    ))
+  (funcall (symbol-function 'set)
+           'tags-table-format-functions
+           erlang-tags-orig-format-functions)
 
   ;; Remove our functions from the TAGS files.  (Note that
   ;; `tags-table-computed-list' need not be the same list as when
@@ -4890,21 +4705,17 @@ for a tag on the form `module:tag'."
 ;;; completion-table' containing all normal tags plus tags on the form
 ;;; `module:tag' and `module:'.
 
-(when (and (locate-library "etags")
-           (require 'etags)
-           (fboundp 'etags-tags-completion-table)
-           (fboundp 'tags-lazy-completion-table)) ; Emacs 23.1+
-  (if (fboundp 'advice-add)
-      ;; Emacs 24.4+
-      (advice-add 'etags-tags-completion-table :around
-                  #'erlang-etags-tags-completion-table-advice)
-    ;; Emacs 23.1-24.3
-    (defadvice etags-tags-completion-table (around
-                                            erlang-replace-tags-table
-                                            activate)
-      (if erlang-replace-etags-tags-completion-table
-          (setq ad-return-value (erlang-etags-tags-completion-table))
-        ad-do-it))))
+(if (fboundp 'advice-add)
+    ;; Emacs 24.4+
+    (advice-add 'etags-tags-completion-table :around
+                #'erlang-etags-tags-completion-table-advice)
+  ;; Emacs 23.1-24.3
+  (defadvice etags-tags-completion-table (around
+                                          erlang-replace-tags-table
+                                          activate)
+    (if erlang-replace-etags-tags-completion-table
+        (setq ad-return-value (erlang-etags-tags-completion-table))
+      ad-do-it)))
 
 (defun erlang-etags-tags-completion-table-advice (oldfun)
   (if erlang-replace-etags-tags-completion-table
@@ -4918,28 +4729,9 @@ Completes to the set of names listed in the current tags table.
 Should the Erlang tags system be installed this command knows
 about Erlang modules."
   (interactive)
-  (condition-case nil
-      (require 'etags)
-    (error nil))
-  (cond ((and (fboundp 'etags-tags-completion-table)
-              (fboundp 'tags-lazy-completion-table)) ; Emacs 23.1+
-         (let ((erlang-replace-etags-tags-completion-table t))
-           (complete-tag)))
-        ((and erlang-tags-installed
-              (fboundp 'complete-tag)
-              (fboundp 'tags-complete-tag)) ; Emacs 19-22
-         (let ((orig-tags-complete-tag (symbol-function 'tags-complete-tag)))
-           (fset 'tags-complete-tag
-                 (symbol-function 'erlang-tags-complete-tag))
-           (unwind-protect
-               (complete-tag)
-             (fset 'tags-complete-tag orig-tags-complete-tag))))
-        ((fboundp 'complete-tag)        ; Emacs 19
-         (complete-tag))
-        ((fboundp 'tag-complete-symbol) ; XEmacs
-         (funcall (symbol-function 'tag-complete-symbol)))
-        (t
-         (error "This version of Emacs can't complete tags"))))
+  (require 'etags)
+  (let ((erlang-replace-etags-tags-completion-table t))
+    (complete-tag)))
 
 
 (defun erlang-find-tag-for-completion ()
@@ -5437,13 +5229,11 @@ The following special commands are available:
             'inferior-erlang-strip-delete nil t)
   (add-hook 'comint-output-filter-functions
             'inferior-erlang-strip-ctrl-m nil t)
-  ;; Some older versions of comint don't have an input ring.
-  (if (fboundp 'comint-read-input-ring)
-      (progn
-        (setq comint-input-ring-file-name erlang-input-ring-file-name)
-        (comint-read-input-ring t)
-        (make-local-variable 'kill-buffer-hook)
-        (add-hook 'kill-buffer-hook 'comint-write-input-ring)))
+
+  (setq comint-input-ring-file-name erlang-input-ring-file-name)
+  (comint-read-input-ring t)
+  (make-local-variable 'kill-buffer-hook)
+  (add-hook 'kill-buffer-hook 'comint-write-input-ring)
   ;; At least in Emacs 21, we need to be in `compilation-minor-mode'
   ;; for `next-error' to work.  We can avoid it clobbering the shell
   ;; keys thus.
@@ -5561,10 +5351,7 @@ editing control characters:
 \\{erlang-shell-mode-map}"
   (interactive
    (when current-prefix-arg
-     (list (if (fboundp 'read-shell-command)
-               ;; `read-shell-command' is a new function in Emacs 23.
-               (read-shell-command "Erlang command: ")
-             (read-string "Erlang command: ")))))
+     (list ((read-shell-command "Erlang command: ")))))
   (require 'comint)
   (let (cmd opts)
     (if command
@@ -5592,10 +5379,8 @@ editing control characters:
 
   (setq inferior-erlang-process
         (get-buffer-process inferior-erlang-buffer))
-  (if (> 21 emacs-major-version) ; funcalls to avoid compiler warnings
-      (funcall (symbol-function 'set-process-query-on-exit-flag)
-               inferior-erlang-process nil)
-    (funcall (symbol-function 'process-kill-without-query) inferior-erlang-process))
+  (funcall (symbol-function 'set-process-query-on-exit-flag)
+           inferior-erlang-process nil)
   (if erlang-inferior-shell-split-window
       (switch-to-buffer-other-window inferior-erlang-buffer)
     (switch-to-buffer inferior-erlang-buffer))
@@ -5663,7 +5448,7 @@ frame will become deselected before the next command."
 (defun inferior-erlang-window (&optional all-frames)
   "Return the window containing the inferior Erlang, or nil."
   (and (inferior-erlang-running-p)
-       (if (and all-frames (>= emacs-major-version 19))
+       (if all-frames
            (get-buffer-window inferior-erlang-buffer t)
          (get-buffer-window inferior-erlang-buffer))))
 
@@ -5735,10 +5520,7 @@ Return the position after the newly inserted command."
     ;; has been sorted out in Emacs 21.  -- fx
     (let ((comint-eol-on-send nil)
           (comint-input-filter (if hist comint-input-filter 'ignore)))
-      (if (and (not erlang-xemacs-p)
-               (>= emacs-major-version 22))
-          (comint-send-input nil t)
-        (comint-send-input)))
+      (comint-send-input nil t))
     ;; Adjust all windows whose points are incorrect.
     (if (null comint-process-echoes)
         (walk-windows
@@ -6122,8 +5904,7 @@ Tab characters are counted by their visual width."
 Simplified version of a combination `defalias' and `make-obsolete',
 it assumes that NEWDEF is loaded."
   (defalias sym (symbol-function newdef))
-  (if (fboundp 'make-obsolete)
-      (make-obsolete sym newdef "long ago")))
+  (make-obsolete sym newdef "long ago"))
 
 
 (erlang-obsolete 'calculate-erlang-indent 'erlang-calculate-indent)
@@ -6143,9 +5924,8 @@ it assumes that NEWDEF is loaded."
 
 (defconst erlang-unload-hook
   (list (lambda ()
-          (when (featurep 'advice)
-            (ad-unadvise 'Man-notify-when-ready)
-            (ad-unadvise 'set-visited-file-name)))))
+          (ad-unadvise 'Man-notify-when-ready)
+          (ad-unadvise 'set-visited-file-name))))
 
 ;; The end...