Add 2006 to copyright years.

diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 40c6bfc2c861cfced5fc5a299fccb731e96ec520..571b4ec132a6bbe18b535aac33ce0287227de78d 100644 (file)
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -1,7 +1,7 @@
 ;;; appt.el --- appointment notification functions
 
-;; Copyright (C) 1989, 1990, 1994, 1998, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1990, 1994, 1998, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>

diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index 91d4d3636df051d0b0cbbfd19b08537181a39d2b..f6419cf9a82bf212ca5a3b3972664bc000bbe370 100644 (file)
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -1,6 +1,7 @@
 ;;; cal-bahai.el --- calendar functions for the Baha'i calendar.
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;;   Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: calendar

diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index a4b83b87b15778c2005a69261a88accf41a9289e..5cdaa5092aa861372f41385630f9d3cc9a0460f7 100644 (file)
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -1,6 +1,6 @@
 ;;; cal-china.el --- calendar functions for the Chinese calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 4673053246fa0fb5b654e9fcef22e050fd1f2e86..c37ab17567f7d36cde0f41c4de28aa1e642181d9 100644 (file)
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -1,6 +1,6 @@
 ;;; cal-coptic.el --- calendar functions for the Coptic/Ethiopic calendars
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index 1f3859d8bf17b54754801e3d4274dc500957201a..62327a99c65591ee88866aab93913a95dc7e3148 100644 (file)
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -1,7 +1,7 @@
 ;;; cal-dst.el --- calendar functions for daylight savings rules
 
-;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Paul Eggert <eggert@twinsun.com>
 ;;     Edward M. Reingold <reingold@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index ed974d312bb5e2f2372fddec5f66198503910eef..0d88f161a033c19b947b8b9882356063827414c5 100644 (file)
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -1,7 +1,7 @@
 ;;; cal-french.el --- calendar functions for the French Revolutionary calendar
 
 ;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003,
-;;   2004, 2005  Free Software Foundation, Inc.
+;;   2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>

diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index 99823db8215e20546fa1efd1a8911f30fee68c80..1272e9966d4f89c4cec5988b7df2e47c165ebb70 100644 (file)
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -1,6 +1,6 @@
 ;;; cal-hebrew.el --- calendar functions for the Hebrew calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Nachum Dershowitz <nachum@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index 528016001572dfa84d851c3d6a1618080c117d07..105bb288eb0b18d10d0a7778e5365d6a0571bf3d 100644 (file)
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -1,6 +1,6 @@
 ;;; cal-islam.el --- calendar functions for the Islamic calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index 41a3713d3ea1fe6e6d99a263c42b5ec2feef174e..c11968e8421a4dbce240054094e0f352311e91e2 100644 (file)
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -1,6 +1,6 @@
 ;;; cal-iso.el --- calendar functions for the ISO calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index 068e705410a200b2ff09417e5f80750d2add7b18..8f7af039d94dcd91e0ae62d487400de1a2c29546 100644 (file)
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -1,6 +1,6 @@
 ;;; cal-julian.el --- calendar functions for the Julian calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index ce4f42e3328ef80f0fa824a0fcd7a40c3522893b..b2d111a4b189aa7c218ba823f0dd840ff3cb3f9b 100644 (file)
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -1,7 +1,7 @@
 ;;; cal-mayan.el --- calendar functions for the Mayan calendars
 
-;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu>
 ;;     Edward M. Reingold <reingold@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index 70275017bfd08a83be36bece78fddd64df216df3..f7c8b284f1bb4b9789dc627a0f91b5ddbd4a5455 100644 (file)
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -1,6 +1,6 @@
 ;;; cal-move.el --- calendar functions for movement in the calendar
 
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index e9583a3f00ded005dc254f565f16d9d162fdbcf1..33c296a77308317e4d99f5ee100fe19ccd3728ee 100644 (file)
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -1,6 +1,6 @@
 ;;; cal-persia.el --- calendar functions for the Persian calendar
 
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>

diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 7b029bc93c5960432989b112423a629186b77911..a67d90c832eada778b5362c422bde534628310e2 100644 (file)
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -1,6 +1,6 @@
 ;;; cal-tex.el --- calendar functions for printing calendars with LaTeX
 
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Steve Fisk <fisk@bowdoin.edu>

diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index a512c7c1e20cf447b2272c867bf2e1240214804f..2e465e1093bfacb63f772ce856403c0c07c5d77b 100644 (file)
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -1,6 +1,6 @@
 ;;; cal-x.el --- calendar windows in dedicated frames in X
 
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 91c396f7bf5164381c954ed13b9ff5530360c74a..a8eeebae8fc8b302538be4835ad4b38b84fcd3ce 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1,7 +1,7 @@
 ;;; diary-lib.el --- diary functions
 
 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005  Free Software Foundation, Inc.
+;;   2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>

diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index b18844c18d9f7e5be2c419f44bca2bd920bfc211..c9a1a0f17e5e2eab2fa1b4b395acdda1c726d68b 100644 (file)
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -1,7 +1,7 @@
 ;;; holidays.el --- holiday functions for the calendar package
 
 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1997, 2001, 2002, 2003,
-;;   2004, 2005  Free Software Foundation, Inc.
+;;   2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>

diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 33f89474504e322cbfe93ec4ae5a27dbb74a8795..e1d513ce680e8f8e29a0a0d1da984bd6b251b738 100644 (file)
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -1,6 +1,6 @@
 ;;; icalendar.el --- iCalendar implementation -*-coding: utf-8 -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author:         Ulf Jasper <ulf.jasper@web.de>
 ;; Created:        August 2002

diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index ed54bc88394ea644fa485e2c125ee81f44db2959..dd2f546fc378252fe734e38d52f3964e462ee845 100644 (file)
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -1,7 +1,7 @@
 ;;; lunar.el --- calendar functions for phases of the moon
 
-;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>

diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index 3e09e7b1fb6a6dad43a6693718b812a9283bb8f9..9587eb57a9f366abf5e1f757fdb672b31e211a70 100644 (file)
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -1,6 +1,6 @@
 ;;; parse-time.el --- parsing time strings
 
-;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>

diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 5b58b739dba016cdc8832a43eff8f5834d20783a..660abb14f885e5c0f4a0faa35ae92781ed98cf85 100644 (file)
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -1,7 +1,7 @@
 ;;; solar.el --- calendar functions for solar events
 
-;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;;     Denis B. Roegel <Denis.Roegel@loria.fr>

diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index fd74e5a6251c863ab1ad7e036a86ec066aaeebae..0de9806d2bb2d134ab85ce0a8f5217f6c2afe83a 100644 (file)
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -1,6 +1,6 @@
 ;;; time-date.el --- Date and time handling functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index f46ec4eba23beb4ea50b63f0d3ea366cd1ccce02..3f2697509f3dfd6b47714e63d3b0b8365fb79634 100644 (file)
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -1,6 +1,6 @@
 ;;; timeclock.el --- mode for keeping track of how much you work
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>

diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index b6871a38ab9d2d08a2c988c8d831c087c2b38c50..6f96ec1cdb224385d2b7cebabcb308516bbe6d4e 100644 (file)
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -1,6 +1,6 @@
 ;;; todo-mode.el --- major mode for editing TODO list files
 
-;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Oliver Seidel <os10000@seidel-space.de>

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 3816fc3fb43f0067369d656753af2b40d3403aa6..6c5b1f53287b09b876d34f70668a8e169bc842ee 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1,7 +1,7 @@
 ;;; f90.el --- Fortran-90 mode (free format)
 
-;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -991,6 +991,16 @@ NAME is non-nil only for type."
                          "?\\([ \t]+\\(\\sw+\\)\\)?\\>"))
       (list (match-string 1) (match-string 3))))
 
+(defsubst f90-looking-at-else-like ()
+  "Return KIND if an ELSE or CASE statement starts after point.
+Returns \"selectcase\", \"elseif\", \"elsewhere\", \"else\", or nil."
+  (when (looking-at f90-else-like-re)
+    (cond ((looking-at "case[ \t]*\\(default\\|\(\\)")
+           "selectcase")
+          ((or (looking-at "else[ \t]*\\(if\\)\\>")
+               (looking-at "else\\(where\\)?\\>"))
+           (concat "else" (match-string 1))))))
+
 (defsubst f90-comment-indent ()
   "Return the indentation to be used for a comment starting at point.
 Used for `comment-indent-function' by F90 mode.
@@ -1430,7 +1440,7 @@ after indenting."
       (skip-chars-forward " \t"))
     (if (looking-at "!")
        (setq indent (f90-comment-indent))
-      (and f90-smart-end (looking-at "end")
+      (and f90-smart-end (looking-at (concat "end\\|" f90-else-like-re))
            (f90-match-end))
       (setq indent (f90-calculate-indent)))
     (or (= indent (current-column))
@@ -1719,6 +1729,29 @@ Leave point at the end of line."
              (replace-match ""))))
     (or (looking-at "[ \t]*!") (delete-horizontal-space))))
 
+(defun f90-else-like-match (beg-block else-block)
+  "Match else-struct with beg-struct and complete else-struct if possible.
+BEG-BLOCK is the type of block as indicated at the start (e.g., if).
+ELSE-BLOCK is the type of block as indicated at the else (may be nil)."
+  (if (not (member beg-block '("if" "where" "select")))
+      (if beg-block
+          (message "%s block cannot have a %s." beg-block else-block)
+        (message "No beginning for %s." else-block))
+    (let ((else-type (cond
+                      ((string-equal else-block "selectcase") "select")
+                      ((string-match "else\\(if\\|where\\)" else-block)
+                       (match-string 1 else-block)))))
+      (unless (f90-equal-symbols beg-block else-type)
+        (if (or else-type
+                (f90-equal-symbols beg-block "select"))
+            (progn
+              (message "%s does not match %s." else-block beg-block)
+              (end-of-line))
+          (cond ((string-equal beg-block "where")
+                 (message "Inserting %s." beg-block)
+                 (search-forward "else" (line-end-position))
+                 (insert beg-block))))))))
+
 (defun f90-match-end ()
   "From an end block statement, find the corresponding block and name."
   (interactive)
@@ -1726,11 +1759,11 @@ Leave point at the end of line."
         (top-of-window (window-start))
        (end-point (point))
         (case-fold-search t)
-       matching-beg beg-name end-name beg-block end-block end-struct)
+       matching-beg beg-name beg-block end-struct else-struct)
     (when (save-excursion (beginning-of-line) (skip-chars-forward " \t0-9")
-                          (setq end-struct (f90-looking-at-program-block-end)))
-      (setq end-block (car end-struct)
-            end-name  (car (cdr end-struct)))
+                          (or (setq end-struct
+                                    (f90-looking-at-program-block-end))
+                              (setq else-struct (f90-looking-at-else-like))))
       (save-excursion
         (beginning-of-line)
         (while (and (> count 0)
@@ -1773,7 +1806,10 @@ Leave point at the end of line."
                 beg-name (car (cdr matching-beg)))
           (goto-char end-point)
           (beginning-of-line)
-          (f90-block-match beg-block beg-name end-block end-name))))))
+          (if else-struct
+              (f90-else-like-match beg-block else-struct)
+            (f90-block-match beg-block beg-name
+                             (car end-struct) (cadr end-struct))))))))
 
 (defun f90-insert-end ()
   "Insert a complete end statement matching beginning of present block."