diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/cedet/ede/emacs.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/cedet/ede/emacs.el')
| -rw-r--r-- | lisp/cedet/ede/emacs.el | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el index 1eb4c6395a4..00496ace16f 100644 --- a/lisp/cedet/ede/emacs.el +++ b/lisp/cedet/ede/emacs.el @@ -1,4 +1,4 @@ -;;; ede/emacs.el --- Special project for Emacs +;;; ede/emacs.el --- Special project for Emacs -*- lexical-binding: t -*- ;; Copyright (C) 2008-2021 Free Software Foundation, Inc. @@ -54,31 +54,6 @@ Return a tuple of ( EMACSNAME . VERSION )." (erase-buffer) (setq default-directory (file-name-as-directory dir)) (cond - ;; Maybe XEmacs? - ((file-exists-p "version.sh") - (setq emacs "XEmacs") - (insert-file-contents "version.sh") - (goto-char (point-min)) - (re-search-forward "emacs_major_version=\\([0-9]+\\) -emacs_minor_version=\\([0-9]+\\) -emacs_beta_version=\\([0-9]+\\)") - (setq ver (concat (match-string 1) "." - (match-string 2) "." - (match-string 3))) - ) - ((file-exists-p "sxemacs.pc.in") - (setq emacs "SXEmacs") - (insert-file-contents "sxemacs_version.m4") - (goto-char (point-min)) - (re-search-forward "m4_define(\\[SXEM4CS_MAJOR_VERSION\\], \\[\\([0-9]+\\)\\]) -m4_define(\\[SXEM4CS_MINOR_VERSION\\], \\[\\([0-9]+\\)\\]) -m4_define(\\[SXEM4CS_BETA_VERSION\\], \\[\\([0-9]+\\)\\])") - (setq ver (concat (match-string 1) "." - (match-string 2) "." - (match-string 3))) - ) - ;; Insert other Emacs here... - ;; Vaguely recent version of GNU Emacs? ((or (file-exists-p configure_ac) (file-exists-p (setq configure_ac "configure.in"))) |