merge upstream

14 files changed, 113 insertions, 82 deletions

diff --git a/etc/grammars/README b/etc/grammars/README
index 657f9c20ecb..c8328bbc885 100644
--- a/etc/grammars/README
+++ b/etc/grammars/README
@@ -3,15 +3,17 @@ generate the parser data in the lisp/semantic/bovine/ and
 lisp/semantic/wisent/ directories.  You can run the parser generators
 with
 
-emacs -batch --no-site-file \
- -l semantic/bovine -l semantic/wisent -l semantic/grammar \
- -l semantic/lex -l bovine-grammar.el \
- -f semantic-mode -f semantic-grammar-batch-build-packages *.by
+emacs -batch --no-site-file -l bovine-grammar.el -f semantic-mode \
+ -f semantic-grammar-batch-build-packages *.by
 
-emacs -batch --no-site-file \
- -l semantic/bovine -l semantic/wisent -l semantic/grammar \
- -l semantic/lex -l wisent-grammar.el \
- -f semantic-mode -f semantic-grammar-batch-build-packages *.wy
+emacs -batch --no-site-file -l wisent-grammar.el -f semantic-mode \
+ -f semantic-grammar-batch-build-packages *.wy
+
+The output files were subsequently edited by hand to fix copyright
+headers, variable names (to follow library name conventions), and
+feature names.  These changes do not alter the code logic, and can be
+viewed by diffing to the files in lisp/semantic/bovine/ and
+lisp/semantic/wisent/.
 
 Currently, the parser files in lisp/ are not generated directly from
 these grammar files when making Emacs.  This state of affairs, and the
diff --git a/etc/grammars/bovine-grammar.el b/etc/grammars/bovine-grammar.el
index 99da6ea5599..5a948608671 100644
--- a/etc/grammars/bovine-grammar.el
+++ b/etc/grammars/bovine-grammar.el
@@ -32,6 +32,9 @@
 (require 'semantic)
 (require 'semantic/grammar)
 (require 'semantic/find)
+(require 'semantic/lex)
+(require 'semantic/wisent)
+(require 'semantic/bovine)
 
 (defun bovine-grammar-EXPAND (bounds nonterm)
   "Expand call to EXPAND grammar macro.
@@ -112,7 +115,6 @@ FORM is a list in which we are substituting.
 Argument QUOTEMODE is non-nil if we are in backquote mode.
 When non-nil, optional argument INPLACE indicates that FORM is being
 expanded from elsewhere."
-  (when (listp form)
   (when (eq (car form) 'quote)
     (setq form (cdr form))
     (cond
@@ -218,7 +220,7 @@ expanded from elsewhere."
          ))
       (if inlist (insert ")"))
       (if inplace (insert ")")))
-    )))
+    ))
 
 (defun bovine-grammar-expand-action (textform quotemode)
   "Expand semantic action string TEXTFORM into Lisp code.
@@ -226,7 +228,6 @@ QUOTEMODE is the mode in which quoted symbols are slurred."
   (if (string= "" textform)
       nil
     (let ((sexp (read textform)))
-
       ;; We converted the lambda string into a list.  Now write it
       ;; out as the bovine lambda expression, and do macro-like
       ;; conversion upon it.
@@ -339,7 +340,6 @@ manual."
         (when (member nterm '("bovine-toplevel" "bovine-inner-scope"))
           (error "`%s' is a reserved internal name" nterm))
         (insert "\n(" nterm)
-
         ;; Process each rule
         (while rules
           (setq items (semantic-tag-get-attribute (car rules) :value)
@@ -375,7 +375,6 @@ manual."
                  (t
                   (insert (semantic-grammar-item-text item)))
                  ))))
-
           (if prec
               (message "%%prec %S ignored" prec))
           (if actn
diff --git a/etc/grammars/c.by b/etc/grammars/c.by
index cf8cb0c638e..1797827679b 100644
--- a/etc/grammars/c.by
+++ b/etc/grammars/c.by
@@ -38,7 +38,7 @@
 ;; >  * Can't parse signature element: "const RmcCmdMCDetailedStatus& status"
 ;; >  * Can't parse signature element: "RmcBucStatus* rftBucStatus"
 
-%package c-by
+%package semantic-c-by
 
 %languagemode  c-mode c++-mode
 %start         declaration
diff --git a/etc/grammars/java-tags.wy b/etc/grammars/java-tags.wy
index aed39669c53..99d2b9df81d 100644
--- a/etc/grammars/java-tags.wy
+++ b/etc/grammars/java-tags.wy
@@ -22,7 +22,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-%package java-tags-wy
+%package wisent-java-tags-wy
 
 %languagemode  java-mode
 
@@ -733,17 +733,17 @@ It ignores whitespaces, newlines and comments."
   semantic-lex-ignore-newline
   semantic-lex-ignore-comments
   ;;;; Auto-generated analyzers.
-  semantic/wisent/java-tags-wy--<number>-regexp-analyzer
-  semantic/wisent/java-tags-wy--<string>-sexp-analyzer
+  wisent-java-tags-wy--<number>-regexp-analyzer
+  wisent-java-tags-wy--<string>-sexp-analyzer
   ;; Must detect keywords before other symbols
-  semantic/wisent/java-tags-wy--<keyword>-keyword-analyzer
-  semantic/wisent/java-tags-wy--<symbol>-regexp-analyzer
-  semantic/wisent/java-tags-wy--<punctuation>-string-analyzer
-  semantic/wisent/java-tags-wy--<block>-block-analyzer
+  wisent-java-tags-wy--<keyword>-keyword-analyzer
+  wisent-java-tags-wy--<symbol>-regexp-analyzer
+  wisent-java-tags-wy--<punctuation>-string-analyzer
+  wisent-java-tags-wy--<block>-block-analyzer
   ;; In theory, unicode chars should be turned into normal chars
   ;; and then combined into regular ascii keywords and text.  This
   ;; analyzer just keeps these things from making the lexer go boom.
-  semantic/wisent/java-tags-wy--<unicode>-regexp-analyzer
+  wisent-java-tags-wy--<unicode>-regexp-analyzer
   ;;;;
   semantic-lex-default-action)
 
diff --git a/etc/grammars/javascript-jv.wy b/etc/grammars/js.wy
index ba518392ae2..a13abf56e6e 100644
--- a/etc/grammars/javascript-jv.wy
+++ b/etc/grammars/js.wy
@@ -1,7 +1,7 @@
 ;;; javascript-jv.wy -- LALR grammar for Javascript
 
 ;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
-;; Copyright (C) Ecma International.
+;; Copyright (C) 1998-2011 Ecma International.
 
 ;; Author: Joakim Verona
 
@@ -57,7 +57,7 @@
 ;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 ;; DAMAGE.
 
-%package javascript-jv-wy
+%package wisent-javascript-jv-wy
 ;; JAVE I prefere ecmascript-mode
 %languagemode ecmascript-mode javascript-mode
 
@@ -509,14 +509,14 @@ OptionalExpression : Expression
   semantic-lex-ignore-comments
 
   ;;stuff generated from the wy file(one for each "type" declaration)
-  semantic/wisent/javascript-jv-wy--<number>-regexp-analyzer
-  semantic/wisent/javascript-jv-wy--<string>-sexp-analyzer
+  wisent-javascript-jv-wy--<number>-regexp-analyzer
+  wisent-javascript-jv-wy--<string>-sexp-analyzer
 
-  semantic/wisent/javascript-jv-wy--<keyword>-keyword-analyzer
+  wisent-javascript-jv-wy--<keyword>-keyword-analyzer
 
-  semantic/wisent/javascript-jv-wy--<symbol>-regexp-analyzer
-  semantic/wisent/javascript-jv-wy--<punctuation>-string-analyzer
-  semantic/wisent/javascript-jv-wy--<block>-block-analyzer
+  wisent-javascript-jv-wy--<symbol>-regexp-analyzer
+  wisent-javascript-jv-wy--<punctuation>-string-analyzer
+  wisent-javascript-jv-wy--<block>-block-analyzer
 
 
   ;;;;more std stuff
diff --git a/etc/grammars/make.by b/etc/grammars/make.by
index 3eb56bf2b49..dab4472b737 100644
--- a/etc/grammars/make.by
+++ b/etc/grammars/make.by
@@ -21,7 +21,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-%package make-by
+%package semantic-make-by
 
 %languagemode  makefile-mode
 %start         Makefile
diff --git a/etc/grammars/python.wy b/etc/grammars/python.wy
index 8a7b7771d53..a0af813e5e8 100644
--- a/etc/grammars/python.wy
+++ b/etc/grammars/python.wy
@@ -86,7 +86,7 @@
 ;; Settings
 ;; --------
 
-%package python-wy
+%package wisent-python-wy
 
 %languagemode python-mode
 
diff --git a/etc/grammars/scheme.by b/etc/grammars/scheme.by
index 9e57afe7438..bc6612d4c70 100644
--- a/etc/grammars/scheme.by
+++ b/etc/grammars/scheme.by
@@ -17,7 +17,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-%package scm-by
+%package semantic-scm-by
 
 %languagemode  scheme-mode
 %start         scheme
diff --git a/etc/grammars/wisent-grammar.el b/etc/grammars/wisent-grammar.el
index 1bef2646645..d7de1ee6f7b 100644
--- a/etc/grammars/wisent-grammar.el
+++ b/etc/grammars/wisent-grammar.el
@@ -26,8 +26,12 @@
 ;; Major mode for editing Wisent's input grammar (.wy) files.
 
 ;;; Code:
+(require 'semantic)
 (require 'semantic/grammar)
 (require 'semantic/find)
+(require 'semantic/lex)
+(require 'semantic/wisent)
+(require 'semantic/bovine)
 
 (defsubst wisent-grammar-region-placeholder (symb)
   "Given a $N placeholder symbol in SYMB, return a $regionN symbol.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index acdd1033933..b4b28005a87 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,28 @@
+2011-07-31  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnmaildir.el (nnmaildir-request-accept-article): Don't call
+        `unix-sync' unless it's defined.
+
+2011-07-31  Marcus Harnisch  <marcus.harnisch@gmx.net>  (tiny change)
+
+        * gnus-art.el (gnus-article-stop-animations): Use `elt' instead of
+        `aref' for XEmacs compatibiltiy.
+
+2011-07-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * spam.el (spam-fetch-field-fast): Rewrite slightly for clarity.
+
+2011-07-31  Dave Abrahams  <dave@boostpro.com>  (tiny change)
+
+        * gnus-sum.el (gnus-summary-refer-thread): Since lambdas aren't
+        closures, quote the form properly (bug#9194).
+
+2011-07-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-summary-insert-new-articles): Clean up slightly.
+        (gnus-summary-insert-new-articles): Protect against servers that are
+        down.
+
 2011-07-29  Daniel Dehennin  <daniel.dehennin@baby-gnu.org>
 
         * mm-decode.el (mm-dissect-buffer): Add a default content-disposition
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c29000f4691..28c6aca367c 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4541,7 +4541,7 @@ commands:
 (defun gnus-article-stop-animations ()
   (dolist (timer (and (boundp 'timer-list)
                       timer-list))
-    (when (eq (aref timer 5) 'image-animate-timeout)
+    (when (eq (elt timer 5) 'image-animate-timeout)
       (cancel-timer timer))))
 
 ;; Set article window start at LINE, where LINE is the number of lines
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 5917c9d7cef..a8cf5e7c427 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9015,9 +9015,9 @@ non-numeric or nil fetch the number specified by the
                    (refs (split-string (or (mail-header-references header)
                                            "")))
                    (gnus-parse-headers-hook
-                    (lambda () (goto-char (point-min))
+                    `(lambda () (goto-char (point-min))
                       (keep-lines
-                       (regexp-opt (append refs (list id subject)))))))
+                       (regexp-opt ',(append refs (list id subject)))))))
               (gnus-fetch-headers (list last) (if (numberp limit)
                                                   (* 2 limit) limit) t)))))
     (when (listp new-headers)
@@ -12851,26 +12851,26 @@ If ALL is a number, fetch this number of articles."
 (defun gnus-summary-insert-new-articles ()
   "Insert all new articles in this group."
   (interactive)
-  (prog1
-      (let ((old (sort (mapcar 'car gnus-newsgroup-data) '<))
-            (old-high gnus-newsgroup-highest)
-            (nnmail-fetched-sources (list t))
-            i new)
-        (setq gnus-newsgroup-active
-              (gnus-copy-sequence
-               (gnus-activate-group gnus-newsgroup-name 'scan)))
-        (setq i (cdr gnus-newsgroup-active)
-              gnus-newsgroup-highest i)
-        (while (> i old-high)
-          (push i new)
-          (decf i))
-        (if (not new)
-            (message "No gnus is bad news")
-          (gnus-summary-insert-articles new)
-          (setq gnus-newsgroup-unreads
-                (gnus-sorted-nunion gnus-newsgroup-unreads new))
-          (gnus-summary-limit (gnus-sorted-nunion old new))))
-    (gnus-summary-position-point)))
+  (let ((old (sort (mapcar 'car gnus-newsgroup-data) '<))
+        (old-high gnus-newsgroup-highest)
+        (nnmail-fetched-sources (list t))
+        (new-active (gnus-activate-group gnus-newsgroup-name 'scan))
+        i new)
+    (unless new-active
+      (error "Couldn't fetch new data"))
+    (setq gnus-newsgroup-active (gnus-copy-sequence new-active))
+    (setq i (cdr gnus-newsgroup-active)
+          gnus-newsgroup-highest i)
+    (while (> i old-high)
+      (push i new)
+      (decf i))
+    (if (not new)
+        (message "No gnus is bad news")
+      (gnus-summary-insert-articles new)
+      (setq gnus-newsgroup-unreads
+            (gnus-sorted-nunion gnus-newsgroup-unreads new))
+      (gnus-summary-limit (gnus-sorted-nunion old new))))
+  (gnus-summary-position-point))
 
 ;;; Bookmark support for Gnus.
 (declare-function bookmark-make-record-default
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 8e2cd4bdde3..bbace7c784a 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -1381,7 +1381,8 @@ by nnmaildir-request-article.")
         (error
          (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
                            'excl)
-         (unix-sync))) ;; no fsync :(
+         (when (fboundp 'unix-sync)
+           (unix-sync)))) ;; no fsync :(
       (nnheader-cancel-timer 24h)
       (condition-case err
           (add-name-to-file tmpfile curfile)
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 33dbaaa1f0c..c7f993d7293 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -1581,31 +1581,31 @@ to find it out)."
   (when (numberp article)
     (let* ((data-header (or prepared-data-header
                             (spam-fetch-article-header article))))
-      (if (arrayp data-header)
-        (cond
-         ((equal field 'number)
-          (mail-header-number data-header))
-         ((equal field 'from)
-          (mail-header-from data-header))
-         ((equal field 'message-id)
-          (mail-header-message-id data-header))
-         ((equal field 'subject)
-          (mail-header-subject data-header))
-         ((equal field 'references)
-          (mail-header-references data-header))
-         ((equal field 'date)
-          (mail-header-date data-header))
-         ((equal field 'xref)
-          (mail-header-xref data-header))
-         ((equal field 'extra)
-          (mail-header-extra data-header))
-         (t
-          (gnus-error
-           5
-           "spam-fetch-field-fast: unknown field %s requested"
-           field)
-          nil))
-        (gnus-message 6 "Article %d has a nil data header" article)))))
+      (cond
+       ((not (arrayp data-header))
+        (gnus-message 6 "Article %d has a nil data header" article))
+       ((equal field 'number)
+        (mail-header-number data-header))
+       ((equal field 'from)
+        (mail-header-from data-header))
+       ((equal field 'message-id)
+        (mail-header-message-id data-header))
+       ((equal field 'subject)
+        (mail-header-subject data-header))
+       ((equal field 'references)
+        (mail-header-references data-header))
+       ((equal field 'date)
+        (mail-header-date data-header))
+       ((equal field 'xref)
+        (mail-header-xref data-header))
+       ((equal field 'extra)
+        (mail-header-extra data-header))
+       (t
+        (gnus-error
+         5
+         "spam-fetch-field-fast: unknown field %s requested"
+         field)
+        nil)))))
 
 (defun spam-fetch-field-from-fast (article &optional prepared-data-header)
   (spam-fetch-field-fast article 'from prepared-data-header))