merge trunk

13 files changed, 38 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index 19dcf6818e3..655fdc278ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * configure.in: Remove reference to iris4d.h.
+
 2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>
 
         * configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.
diff --git a/configure.in b/configure.in
index 2c258174d46..25e19f43a94 100644
--- a/configure.in
+++ b/configure.in
@@ -536,7 +536,7 @@ case "${canonical}" in
   ## Silicon Graphics machines
   ## Iris 4D
   mips-sgi-irix6.5 )
-    machine=iris4d opsys=irix6-5
+    opsys=irix6-5
     # Without defining _LANGUAGE_C, things get masked out in the headers
     # so that, for instance, grepping for `free' in stdlib.h fails and
     # AC_HEADER_STD_C fails.   (MIPSPro 7.2.1.2m compilers, Irix 6.5.3m).
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5e80b5029ff..f2098dc210d 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * themes/dichromacy-theme.el:
+        * themes/tango-theme.el:
+        * themes/tango-dark-theme.el:
+        * themes/wheatgrass-theme.el: Don't define button face separately;
+        it inherits from link now.
+
 2011-07-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * NEWS: Clarify that `smtpmail-starttls-credentials' doesn't exist.
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index 0105080ab08..31f27d9fb8a 100644
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -72,7 +72,6 @@ Ansi-Color faces are included.")
    `(font-lock-warning-face ((,class (:weight bold :slant italic
                                       :foreground ,vermillion))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground ,blue))))
    `(link ((,class (:underline t :foreground ,blue))))
    `(link-visited ((,class (:underline t :foreground ,redpurple))))
    ;; Gnus faces
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index b5621d10320..403370c90cb 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -86,7 +86,6 @@ Semantic, and Ansi-Color faces are included.")
    `(font-lock-variable-name-face ((,class (:foreground ,orange-1))))
    `(font-lock-warning-face ((,class (:foreground ,red-0))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground ,blue-1))))
    `(link ((,class (:underline t :foreground ,blue-1))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
    ;; Gnus faces
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index c58e0036353..9d0f0aca94a 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -77,7 +77,6 @@ Semantic, and Ansi-Color faces are included.")
    `(font-lock-variable-name-face ((,class (:foreground ,orange-4))))
    `(font-lock-warning-face ((,class (:foreground ,red-2))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground ,blue-3))))
    `(link ((,class (:underline t :foreground ,blue-3))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
    ;; Gnus faces
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 3a08bb63d96..9f8772c4d6e 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -47,7 +47,6 @@ of green, brown, and blue.")
    `(font-lock-variable-name-face ((,class (:foreground "yellow green"))))
    `(font-lock-warning-face ((,class (:foreground "salmon1"))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground "cyan"))))
    `(link ((,class (:underline t :foreground "cyan"))))
    `(link-visited ((,class (:underline t :foreground "dark cyan"))))
    ;; Gnus faces
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5dd52709746..42c1686e9d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-06  Kenichi Handa  <handa@m17n.org>
+2011-07-07  Kenichi Handa  <handa@m17n.org>
 
         * international/characters.el (build-unicode-category-table):
         Delete it.
@@ -34,6 +34,13 @@
         * loadup.el: Load international/charprop.el before
         international/characters.
 
+2011-07-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (next-buffer, previous-buffer): Signal an error if
+        called from a minibuffer window.
+
+        * bindings.el: Revert 2011-07-04 change.
+
 2011-07-06  Richard Stallman  <rms@gnu.org>
 
         * mail/rmailmm.el (rmail-mime-process): Use markers for buf positions.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 2f035608528..99d9aa36e35 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -807,8 +807,6 @@ if `inhibit-field-text-motion' is non-nil."
   (define-key map [up]    'previous-history-element)
   (define-key map "\es"   'next-matching-history-element)
   (define-key map "\er"   'previous-matching-history-element)
-  (define-key map [remap next-buffer] 'ignore)
-  (define-key map [remap previous-buffer] 'ignore)
   ;; Override the global binding (which calls indent-relative via
   ;; indent-for-tab-command).  The alignment that indent-relative tries to
   ;; do doesn't make much sense here since the prompt messes it up.
diff --git a/lisp/window.el b/lisp/window.el
index 2b98630a51e..2c4bf0dcb23 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2819,11 +2819,15 @@ displayed there."
 (defun next-buffer ()
   "In selected window switch to next buffer."
   (interactive)
+  (if (window-minibuffer-p)
+      (error "Cannot switch buffers in minibuffer window"))
   (switch-to-next-buffer))
 
 (defun previous-buffer ()
   "In selected window switch to previous buffer."
   (interactive)
+  (if (window-minibuffer-p)
+      (error "Cannot switch buffers in minibuffer window"))
   (switch-to-prev-buffer))
 
 (defun delete-windows-on (&optional buffer-or-name frame)
diff --git a/src/ChangeLog b/src/ChangeLog
index a3536cda7a4..642445b2328 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-06  Kenichi Handa  <handa@m17n.org>
+2011-07-07  Kenichi Handa  <handa@m17n.org>
 
         * character.h (unicode_category_t): New enum type.
 
@@ -40,6 +40,11 @@
         * font.c (font_range): Adjusted for the change of
         Vunicode_category_table.
 
+2011-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/iris4d.h: Remove file, move contents ...
+        * s/irix6-5.h: ... here.
+
 2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove unportable assumption about struct layout (Bug#8884).
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
deleted file mode 100644
index 881f71f846f..00000000000
--- a/src/m/iris4d.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* machine description file for Iris-4D machines.  Use with s/irix*.h.
-
-Copyright (C) 1987, 2001-2011  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
-   were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
-   the value field of a LISP_OBJECT).  */
-#define DATA_START 0x10000000
-#define DATA_SEG_BITS   0x10000000
-
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index d283571d8fb..26eb7dcde77 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -96,3 +96,10 @@ char *_getpty();
 /* Tested on Irix 6.5.  SCM worked on earlier versions.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
+
+
+/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
+   were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
+   the value field of a LISP_OBJECT).  */
+#define DATA_START 0x10000000
+#define DATA_SEG_BITS   0x10000000