summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-10-13 16:01:20 -0700
committerGlenn Morris <rgm@gnu.org>2013-10-13 16:01:20 -0700
commit9148ee920e97405e0c89298a63aeb3088a4cf31f (patch)
treebd31f4c8b09c4f0e3fdf3d01a609778d0a64c510
parenta9ba094b81d899218e8762a66377b2fe71274d35 (diff)
downloademacs-9148ee920e97405e0c89298a63aeb3088a4cf31f.tar.gz
* configure.ac [alpha]: Explicit error in non-ELF case.
* doc/emacs/ack.texi (Acknowledgments): Comment out old alpha stuff. * lisp/emacs-lisp/authors.el (authors-fixed-entries): Comment out old alpha stuff. Fixes: debbugs:15601
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac7
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/ack.texi4
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/authors.el4
6 files changed, 23 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 55e987d4e3a..c1700c017a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-13 Glenn Morris <rgm@gnu.org>
+
+ * configure.ac [alpha]: Explicit error in non-ELF case. (Bug#15601)
+
2013-10-12 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
diff --git a/configure.ac b/configure.ac
index 40da4af157e..ee6d6959ba6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1175,10 +1175,13 @@ case $canonical in
if test "x$GCC" = "xyes"; then
C_SWITCH_MACHINE="-fno-common"
else
- AC_MSG_ERROR([What gives? Fix me if DEC Unix supports ELF now.])
+ AC_MSG_ERROR([Non-GCC compilers are not supported.])
fi
else
- UNEXEC_OBJ=unexalpha.o
+ dnl This was the unexalpha.c case. Removed in 24.1, 2010-07-24,
+ dnl albeit under the mistaken assumption that said file
+ dnl was no longer used.
+ AC_MSG_ERROR([Non-ELF systems are not supported since Emacs 24.1.])
fi
;;
esac
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index cf6b2fa3906..389757eee65 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-13 Glenn Morris <rgm@gnu.org>
+
+ * ack.texi (Acknowledgments): Comment out old alpha stuff.
+
2013-10-13 Xue Fuqiao <xfq.free@gmail.com>
* calendar.texi (Special Diary Entries): Remove @refill.
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 7c0d28c752a..0cfcfb5e4b3 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1099,9 +1099,11 @@ Ronald S. Schnell wrote @file{dunnet.el}, a text adventure game.
Philippe Schnoebelen wrote @file{gomoku.el}, a Go Moku game played
against Emacs; and @file{mpuz.el}, a multiplication puzzle.
-@c FIXME files no longer included; but see bug 15601.
+@ignore
+@c Removed in 24.1.
@item
Rainer Schöpf contributed to Alpha and OSF1 support.
+@end ignore
@item
Jan Schormann wrote @file{solitaire.el}, an implementation of the
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7eedf1dc65..e47360b6cfc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-13 Glenn Morris <rgm@gnu.org>
+
+ * emacs-lisp/authors.el (authors-fixed-entries):
+ Comment out old alpha stuff.
+
2013-10-13 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-mode): Add `ruby-mode-set-encoding'
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 809511cb6b7..92796ac4e99 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -518,8 +518,8 @@ Changes to files in this list are not listed.")
("Schlumberger Technology Corporation" :changed "gud.el")
;; Replaced by tcl.el.
;;; ("Gregor Schmid" :wrote "tcl-mode.el")
- ;; FIXME files no longer included; but see bug 15601
- ("Rainer Schöpf" :wrote "alpha.h" "unexalpha.c")
+ ;; No longer distributed since 24.1.
+;;; ("Rainer Schöpf" :wrote "alpha.h" "unexalpha.c")
;; No longer distributed: emacsserver.c.
("William Sommerfeld" :wrote "emacsclient.c" "scribe.el")
;; No longer distributed: emacsserver.c.