From a20b38486064df846462bef95a15b51200f12ed3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 8 Feb 2006 07:54:11 +0000 Subject: [PATCH 01/58] Add 2006 to copyright years. --- lisp/calendar/appt.el | 4 +-- lisp/calendar/cal-bahai.el | 3 ++- lisp/calendar/cal-china.el | 2 +- lisp/calendar/cal-coptic.el | 2 +- lisp/calendar/cal-dst.el | 4 +-- lisp/calendar/cal-french.el | 2 +- lisp/calendar/cal-hebrew.el | 2 +- lisp/calendar/cal-islam.el | 2 +- lisp/calendar/cal-iso.el | 2 +- lisp/calendar/cal-julian.el | 2 +- lisp/calendar/cal-mayan.el | 4 +-- lisp/calendar/cal-move.el | 2 +- lisp/calendar/cal-persia.el | 2 +- lisp/calendar/cal-tex.el | 2 +- lisp/calendar/cal-x.el | 2 +- lisp/calendar/diary-lib.el | 2 +- lisp/calendar/holidays.el | 2 +- lisp/calendar/icalendar.el | 2 +- lisp/calendar/lunar.el | 4 +-- lisp/calendar/parse-time.el | 2 +- lisp/calendar/solar.el | 4 +-- lisp/calendar/time-date.el | 2 +- lisp/calendar/timeclock.el | 2 +- lisp/calendar/todo-mode.el | 2 +- lisp/progmodes/f90.el | 52 +++++++++++++++++++++++++++++++------ 25 files changed, 74 insertions(+), 37 deletions(-) diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 40c6bfc2c86..571b4ec132a 100644 --- 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 ;; Maintainer: Glenn Morris diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el index 91d4d3636df..f6419cf9a82 100644 --- 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 ;; Keywords: calendar diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el index a4b83b87b15..5cdaa5092aa 100644 --- 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 diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el index 4673053246f..c37ab17567f 100644 --- 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 diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index 1f3859d8bf1..62327a99c65 100644 --- 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 ;; Edward M. Reingold diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el index ed974d312bb..0d88f161a03 100644 --- 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 ;; Maintainer: Glenn Morris diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el index 99823db8215..1272e9966d4 100644 --- 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 diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el index 52801600157..105bb288eb0 100644 --- 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 diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el index 41a3713d3ea..c11968e8421 100644 --- 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 diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el index 068e705410a..8f7af039d94 100644 --- 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 diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el index ce4f42e3328..b2d111a4b18 100644 --- 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 ;; Edward M. Reingold diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el index 70275017bfd..f7c8b284f1b 100644 --- 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 diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el index e9583a3f00d..33c296a7730 100644 --- 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 diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index 7b029bc93c5..a67d90c832e 100644 --- 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 diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el index a512c7c1e20..2e465e1093b 100644 --- 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 diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 91c396f7bf5..a8eeebae8fc 100644 --- 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 ;; Maintainer: Glenn Morris diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index b18844c18d9..c9a1a0f17e5 100644 --- 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 ;; Maintainer: Glenn Morris diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 33f89474504..e1d513ce680 100644 --- 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 ;; Created: August 2002 diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el index ed54bc88394..dd2f546fc37 100644 --- 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 ;; Maintainer: Glenn Morris diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el index 3e09e7b1fb6..9587eb57a9f 100644 --- 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 diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 5b58b739dba..660abb14f88 100644 --- 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 ;; Denis B. Roegel diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index fd74e5a6251..0de9806d2bb 100644 --- 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 diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index f46ec4eba23..3f2697509f3 100644 --- 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 diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index b6871a38ab9..6f96ec1cdb2 100644 --- 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 diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 3816fc3fb43..6c5b1f53287 100644 --- 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 ;; Maintainer: Glenn Morris @@ -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." From 28371538ef85f20e1e330b780dadeb136eeec0ca Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 8 Feb 2006 07:54:54 +0000 Subject: [PATCH 02/58] *** empty log message *** --- admin/FOR-RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index e8411b3c7c5..e0776ed9d92 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -69,7 +69,7 @@ leim working Kenichi Handa lib-src done ttn lisp done ttn lisp/calc done Jay Belanger -lisp/calendar working Glenn Morris +lisp/calendar done Glenn Morris lisp/emacs-lisp done ttn lisp/emulation done ttn lisp/eshell done ttn From ab09adac9b3c3d45c89ac05cbfd39313782ce165 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 8 Feb 2006 08:05:13 +0000 Subject: [PATCH 03/58] Revert previous inadvertent check-in of local changes. --- lisp/progmodes/f90.el | 48 ++++++------------------------------------- 1 file changed, 6 insertions(+), 42 deletions(-) diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 6c5b1f53287..e661552c331 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -991,16 +991,6 @@ 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. @@ -1440,7 +1430,7 @@ after indenting." (skip-chars-forward " \t")) (if (looking-at "!") (setq indent (f90-comment-indent)) - (and f90-smart-end (looking-at (concat "end\\|" f90-else-like-re)) + (and f90-smart-end (looking-at "end") (f90-match-end)) (setq indent (f90-calculate-indent))) (or (= indent (current-column)) @@ -1729,29 +1719,6 @@ 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) @@ -1759,11 +1726,11 @@ ELSE-BLOCK is the type of block as indicated at the else (may be nil)." (top-of-window (window-start)) (end-point (point)) (case-fold-search t) - matching-beg beg-name beg-block end-struct else-struct) + matching-beg beg-name end-name beg-block end-block end-struct) (when (save-excursion (beginning-of-line) (skip-chars-forward " \t0-9") - (or (setq end-struct - (f90-looking-at-program-block-end)) - (setq else-struct (f90-looking-at-else-like)))) + (setq end-struct (f90-looking-at-program-block-end))) + (setq end-block (car end-struct) + end-name (car (cdr end-struct))) (save-excursion (beginning-of-line) (while (and (> count 0) @@ -1806,10 +1773,7 @@ ELSE-BLOCK is the type of block as indicated at the else (may be nil)." beg-name (car (cdr matching-beg))) (goto-char end-point) (beginning-of-line) - (if else-struct - (f90-else-like-match beg-block else-struct) - (f90-block-match beg-block beg-name - (car end-struct) (cadr end-struct)))))))) + (f90-block-match beg-block beg-name end-block end-name)))))) (defun f90-insert-end () "Insert a complete end statement matching beginning of present block." From e99c752190064f6d73540fb61556dabdbc0b83f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Wed, 8 Feb 2006 13:39:52 +0000 Subject: [PATCH 04/58] * window.c (adjust_window_trailing_edge): Check that shrinking does not set a window to size zero or less. --- src/ChangeLog | 5 +++++ src/window.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 477d7e421f3..40d498b5d47 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Jan Dj,Ad(Brv + + * window.c (adjust_window_trailing_edge): Check that shrinking + does not set a window to size zero or less. + 2006-02-08 Miles Bader * editfns.c (Fconstrain_to_field): Use Fget_char_property instead diff --git a/src/window.c b/src/window.c index 1df0320f01c..5ffb8c95593 100644 --- a/src/window.c +++ b/src/window.c @@ -4284,6 +4284,14 @@ adjust_window_trailing_edge (window, delta, horiz_flag) { if (!NILP (XWINDOW (window)->next)) { + /* This may happen for the minibuffer. In that case + the window_deletion_count check below does not work. */ + if (XINT (CURSIZE (p->next)) - delta <= 0) + { + Fset_window_configuration (old_config); + error ("Cannot adjust window size as specified"); + } + XSETINT (CURBEG (p->next), XINT (CURBEG (p->next)) + delta); size_window (p->next, XINT (CURSIZE (p->next)) - delta, From 201a821a54684f1ed622ed4bdadf81bc85c79a75 Mon Sep 17 00:00:00 2001 From: Peter Galbraith Date: Wed, 8 Feb 2006 14:32:40 +0000 Subject: [PATCH 05/58] * mh-e.el (mh-invisible-header-fields-internal): Added entries "X-BrightmailFiltered:", "X-Brightmail-Tracker:" and "X-Hashcash" --- lisp/mh-e/ChangeLog | 5 +++++ lisp/mh-e/mh-e.el | 3 +++ 2 files changed, 8 insertions(+) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 47c7808f192..de73f331aa0 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Peter S Galbraith + + * mh-e.el (mh-invisible-header-fields-internal): Added entries + "X-BrightmailFiltered:", "X-Brightmail-Tracker:" and "X-Hashcash" + 2006-02-04 Bill Wohler * mh-e.el (mh-inc-spool-list): Update example for Emacs 22 which diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 8012eab5c8a..ab0143c0c85 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -2306,6 +2306,8 @@ of citations entirely, choose \"None\"." "X-Authentication-Warning:" ; sendmail "X-Beenthere:" ; Mailman mailing list manager "X-Bogosity:" ; bogofilter + "X-BrightmailFiltered:" ; Brightmail + "X-Brightmail-Tracker:" ; Brightmail "X-Bugzilla-*" ; Bugzilla "X-Complaints-To:" "X-ContentStamp:" ; NetZero @@ -2333,6 +2335,7 @@ of citations entirely, choose \"None\"." "X-Habeas-SWE-7:" ; Spam "X-Habeas-SWE-8:" ; Spam "X-Habeas-SWE-9:" ; Spam + "X-Hashcash:" ; hashcash "X-Info:" ; NTMail "X-Juno-" ; Juno "X-List-Host:" ; Unknown mailing list managers From df2a9b125d690a972e6cd69af256352c6e400d92 Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Wed, 8 Feb 2006 15:47:31 +0000 Subject: [PATCH 06/58] (tramp-maybe-open-connection): Do not wait for output from a dead connection. --- lisp/ChangeLog | 7 ++++++- lisp/net/tramp.el | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 64a1dcec7e2..c607ca350b2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Sam Steingold + + * net/tramp.el (tramp-maybe-open-connection): Do not wait for + output from a dead connection. + 2006-02-07 Mathias Dahl * dired.el (dired-mode-map): Add more bindings for tumme. @@ -351,7 +356,7 @@ * international/latexenc.el: Add a suitable `coding:' tag. (latexenc-find-file-coding-system): Undo last change. -2006-01-27 Arne J,bx(Brgensen +2006-01-27 Arne J,Ax(Brgensen * international/latexenc.el (latexenc-find-file-coding-system): Make sure latexenc-main-file is a regular file and is readable. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 2fdf63ce351..afe5308a918 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -6482,7 +6482,8 @@ connection if a previous connection has died for some reason." p (processp p) (memq (process-status p) '(run open))) (tramp-send-command multi-method method user host "echo are you awake" nil t) - (unless (tramp-wait-for-output 10) + (unless (and (memq (process-status p) '(run open)) + (tramp-wait-for-output 10)) (delete-process p) (setq p nil)) (erase-buffer))) From 8392fe4a44e69f137eebfd2187b403cce6101e11 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 8 Feb 2006 17:10:39 +0000 Subject: [PATCH 07/58] (%-Constructs): Remove obsolete info about `global-mode-string'. --- lispref/ChangeLog | 5 +++++ lispref/modes.texi | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index c1cc71f0d8b..d27c36112ac 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Juanma Barranquero + + * modes.texi (%-Constructs): Remove obsolete info about + `global-mode-string'. + 2006-02-07 Richard M. Stallman * commands.texi (Prefix Command Arguments): Minor cleanup. diff --git a/lispref/modes.texi b/lispref/modes.texi index 0c7d249fb87..b9eb33dcb88 100644 --- a/lispref/modes.texi +++ b/lispref/modes.texi @@ -2012,8 +2012,7 @@ obsolete, since you can get the same results with the variables The value of @code{mode-name}. @item %M -The value of @code{global-mode-string}. Currently, only -@code{display-time} modifies the value of @code{global-mode-string}. +The value of @code{global-mode-string}. @end table @node Properties in Mode From 063cd226b900cfcfcc98fd1d12ad1c0ad535f0c5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 8 Feb 2006 17:32:09 +0000 Subject: [PATCH 08/58] (compile): Append "|| true" to the end of the `find' command, like compile-always does. --- lisp/ChangeLog | 5 +++++ lisp/Makefile.in | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c607ca350b2..2dabb698218 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Mathias Megyei (tiny change) + + * Makefile.in (compile): Append "|| true" to the end of the `find' + command, like compile-always does. + 2006-02-08 Sam Steingold * net/tramp.el (tramp-maybe-open-connection): Do not wait for diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 8c60b711f90..e90c6161f75 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -153,8 +153,10 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) # subdirectories, to make sure require's and load's in the files being # compiled find the right files. +# `|| true' below prevents old Bash versions from getting confused +# by an error. compile: $(lisp)/subdirs.el mh-autoloads doit - find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \ + find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \ wd=$(lisp); $(setwins); \ els=`echo $$wins | tr ' \011' '\012\012' | \ sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ From db58efbf51c969dea052cb259ee0a01078e4db68 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 8 Feb 2006 17:39:10 +0000 Subject: [PATCH 09/58] (rcirc-startup-channels-alist): Add irc.freenode.net and #emacs as defaults. (rcirc-ignore-all-activity-flag): Remove variable. (rcirc-authinfo): New variable. (rcirc-authinfo-filename): Remove variable. (rcirc-always-use-server-buffer-flag): New flag. (rcirc): M-x rcirc will automatically connect without prompting. C-u M-x rcirc will prompt. Use rcirc-connect to create a connection in lisp. (rcirc-process-server-response-1): Remove everything but the nick portion of the sender so it doesn't need to be done everywhere else. Update related code. (global-map): Remove global keybindings. (rcirc-get-buffer-create): Make sure rcirc-topic is set. (rcirc-send-input): Split into several functions. (rcirc-process-input-line, rcirc-process-message, rcirc-process-command): New functions. (rcirc-target-buffer): Add function to determine where to route messages. (rcirc-user-nick): Save match data. (rcirc-toggle-ignore-buffer-activity) (rcirc-update-activity-string): Remove global ignore functionality, which can be done now by toggling rcirc-track-minor-mode. (rcirc-track-minor-mode-map): New keymap. (rcirc-track-minor-mode): New minor-mode. (ignore): Make the ignore output nicer. Always print it when adding or removing nicks. (rcirc-url-regexp): Improve. (rcirc-mangle-text): Remove properties before using text in the modeline. (rcirc-authenticate): Authentication data comes from rcirc-authinfo, not the file pointed to by rcirc-authinfo-file. (rcirc-server-prefix): Inherit from rcirc-server. --- lisp/ChangeLog | 37 ++++ lisp/net/rcirc.el | 522 ++++++++++++++++++++++++---------------------- 2 files changed, 309 insertions(+), 250 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2dabb698218..c03d0171f06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,40 @@ +2006-02-08 Ryan Yeske + + * net/rcirc.el (rcirc-startup-channels-alist): Add + irc.freenode.net and #emacs as defaults. + (rcirc-ignore-all-activity-flag): Remove variable. + (rcirc-authinfo): New variable. + (rcirc-authinfo-filename): Remove variable. + (rcirc-always-use-server-buffer-flag): New flag. + (rcirc): M-x rcirc will automatically connect without prompting. + C-u M-x rcirc will prompt. Use rcirc-connect to create a + connection in lisp. + (rcirc-process-server-response-1): Remove everything but the nick + portion of the sender so it doesn't need to be done everywhere + else. Update related code. + (global-map): Remove global keybindings. + (rcirc-get-buffer-create): Make sure rcirc-topic is set. + (rcirc-send-input): Split into several functions. + (rcirc-process-input-line, rcirc-process-message) + (rcirc-process-command): New functions. + (rcirc-target-buffer): New function to determine where to route + messages. + (rcirc-user-nick): Save match data. + (rcirc-toggle-ignore-buffer-activity) + (rcirc-update-activity-string): Remove global ignore + functionality, which can be done now by toggling + rcirc-track-minor-mode. + (rcirc-track-minor-mode-map): New keymap. + (rcirc-track-minor-mode): New minor-mode. + (ignore): Make the ignore output nicer. Always print it when + adding or removing nicks. + (rcirc-url-regexp): Improve. + (rcirc-mangle-text): Remove properties before using text in the + modeline. + (rcirc-authenticate): Authentication data comes from + rcirc-authinfo, not the file pointed to by rcirc-authinfo-file. + (rcirc-server-prefix): Inherit from rcirc-server. + 2006-02-08 Mathias Megyei (tiny change) * Makefile.in (compile): Append "|| true" to the end of the `find' diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index fc7399ee631..29beea21a89 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -79,7 +79,7 @@ :type 'string :group 'rcirc) -(defcustom rcirc-startup-channels-alist nil +(defcustom rcirc-startup-channels-alist '(("^irc.freenode.net$" "#emacs")) "Alist of channels to join at startup. Each element looks like (SERVER-REGEXP . CHANNEL-LIST)." :type '(alist :key-type string :value-type (repeat string)) @@ -111,11 +111,6 @@ underneath each nick." "If non-nil, ignore activity in this buffer.") (make-variable-buffer-local 'rcirc-ignore-buffer-activity-flag) -(defcustom rcirc-ignore-all-activity-flag nil - "*Non-nil means do not indicate any activity in the modeline." - :type 'boolean - :group 'rcirc) - (defcustom rcirc-time-format "%H:%M " "*Describes how timestamps are printed. Used as the first arg to `format-time-string'." @@ -140,29 +135,42 @@ number. If zero or nil, no truncating is done." (integer :tag "Number of lines")) :group 'rcirc) -(defcustom rcirc-authinfo-file-name - "~/.rcirc-authinfo" - "File containing rcirc authentication passwords. -The file consists of a single list, with each element itself a -list with a SERVER-REGEXP string, a NICK-REGEXP string, a METHOD -and the remaining method specific ARGUMENTS. The valid METHOD -symbols are `nickserv', `chanserv' and `bitlbee'. +(defcustom rcirc-authinfo nil + "List of authentication passwords. +Each element of the list is a list with a SERVER-REGEXP string +and a method symbol followed by method specific arguments. + +The valid METHOD symbols are `nickserv', `chanserv' and +`bitlbee'. The required ARGUMENTS for each METHOD symbol are: - `nickserv': PASSWORD - `chanserv': CHANNEL PASSWORD - `bitlbee': PASSWORD + `nickserv': NICK PASSWORD + `chanserv': NICK CHANNEL PASSWORD + `bitlbee': NICK PASSWORD Example: - ((\"freenode\" \"bob\" nickserv \"p455w0rd\") - (\"freenode\" \"bob\" chanserv \"#bobland\" \"passwd99\") - (\"bitlbee\" \"robert\" bitlbee \"sekrit\"))" - :type 'string + ((\"freenode\" nickserv \"bob\" \"p455w0rd\") + (\"freenode\" chanserv \"bob\" \"#bobland\" \"passwd99\") + (\"bitlbee\" bitlbee \"robert\" \"sekrit\"))" + :type '(alist :key-type (string :tag "Server") + :value-type (choice (list :tag "NickServ" + (const nickserv) + (string :tag "Nick") + (string :tag "Password")) + (list :tag "ChanServ" + (const chanserv) + (string :tag "Nick") + (string :tag "Channel") + (string :tag "Password")) + (list :tag "BitlBee" + (const bitlbee) + (string :tag "Nick") + (string :tag "Password")))) :group 'rcirc) -(defcustom rcirc-auto-authenticate-flag (file-readable-p rcirc-authinfo-file-name) +(defcustom rcirc-auto-authenticate-flag t "*Non-nil means automatically send authentication string to server. -See also `rcirc-authinfo-file-name'." +See also `rcirc-authinfo'." :type 'boolean :group 'rcirc) @@ -199,6 +207,11 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT." :type 'hook :group 'rcirc) +(defcustom rcirc-always-use-server-buffer-flag nil + "Non-nil means messages without a channel target will go to the server buffer." + :type 'boolean + :group 'rcirc) + (defvar rcirc-prompt-start-marker nil) (defvar rcirc-prompt-end-marker nil) @@ -238,37 +251,35 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT." (defvar rcirc-startup-channels nil) ;;;###autoload -(defun rcirc (&optional server port nick channels) +(defun rcirc (arg) "Connect to IRC. - -If any of the the optional SERVER, PORT, NICK or CHANNELS are not -supplied, they are taken from the variables `rcirc-server', -`rcirc-port', `rcirc-nick', and `rcirc-startup-channels-alist', -respectively." - (interactive (list (read-string "IRC Server: " rcirc-server) - (read-string "IRC Port: " (number-to-string rcirc-port)) - (read-string "IRC Nick: " rcirc-nick))) - (or server (setq server rcirc-server)) - (or port (setq port rcirc-port)) - (or nick (setq nick rcirc-nick)) - (or channels - (setq channels - (if (interactive-p) - (split-string - (read-string "Channels: " - (mapconcat 'identity - (rcirc-startup-channels server) - " ")) - "[, ]+" t) - (rcirc-startup-channels server)))) - (or global-mode-string (setq global-mode-string '(""))) - (and (not (memq 'rcirc-activity-string global-mode-string)) - (setq global-mode-string - (append global-mode-string '(rcirc-activity-string)))) - (add-hook 'window-configuration-change-hook - 'rcirc-window-configuration-change) - (rcirc-connect server port nick rcirc-user-name rcirc-user-full-name - channels)) +If ARG is non-nil, prompt for a server to connect to." + (interactive "P") + (if arg + (let* ((server (read-string "IRC Server: " rcirc-server)) + (port (read-string "IRC Port: " (number-to-string rcirc-port))) + (nick (read-string "IRC Nick: " rcirc-nick)) + (channels (split-string + (read-string "IRC Channels: " + (mapconcat 'identity + (rcirc-startup-channels server) + " ")) + "[, ]+" t))) + (rcirc-connect server port nick rcirc-user-name rcirc-user-full-name + channels)) + ;; make new connection using defaults unless already connected to + ;; the default rcirc-server + (let ((default-server (default-value 'rcirc-server)) + connected) + (dolist (p (rcirc-process-list)) + (when (string= default-server (process-name p)) + (setq connected p))) + (if (not connected) + (rcirc-connect rcirc-server rcirc-port rcirc-nick + rcirc-user-name rcirc-user-full-name + (rcirc-startup-channels rcirc-server)) + (switch-to-buffer (process-buffer connected)) + (message "Connected to %s" rcirc-server))))) ;;;###autoload (defalias 'irc 'rcirc) @@ -279,11 +290,9 @@ respectively." (defvar rcirc-keepalive-timer nil) (defvar rcirc-last-server-message-time nil) (defun rcirc-connect (server port nick user-name full-name startup-channels) - "Return a connection to SERVER on PORT. + (add-hook 'window-configuration-change-hook + 'rcirc-window-configuration-change) -User will identify using the values of NICK, USER-NAME and -FULL-NAME. The variable list of channel names in -STARTUP-CHANNELS will automatically be joined on startup." (save-excursion (message "Connecting to %s..." server) (let* ((inhibit-eol-conversion) @@ -377,13 +386,13 @@ Functions are called with PROCESS and SENTINEL arguments.") (rcirc-debug process (format "SENTINEL: %S %S\n" process sentinel)) (with-rcirc-process-buffer process (dolist (buffer (cons nil (mapcar 'cdr rcirc-buffer-alist))) - (rcirc-print process "rcirc.el" "ERROR" buffer - (format "%s: %s (%S)" - (process-name process) - sentinel - (process-status process)) t) - ;; remove the prompt from buffers (with-current-buffer (or buffer (current-buffer)) + (rcirc-print process "rcirc.el" "ERROR" rcirc-target + (format "%s: %s (%S)" + (process-name process) + sentinel + (process-status process)) t) + ;; remove the prompt from buffers (let ((inhibit-read-only t)) (delete-region rcirc-prompt-start-marker rcirc-prompt-end-marker))))) @@ -428,7 +437,8 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.") (defun rcirc-process-server-response-1 (process text) (if (string-match "^\\(:\\([^ ]+\\) \\)?\\([^ ]+\\) \\(.+\\)$" text) - (let* ((sender (match-string 2 text)) + (let* ((user (match-string 2 text)) + (sender (rcirc-user-nick user)) (cmd (match-string 3 text)) (args (match-string 4 text)) (handler (intern-soft (concat "rcirc-handler-" cmd)))) @@ -487,12 +497,10 @@ If NOTICEP is non-nil, send a notice instead of privmsg." text)) (more (if oversize (substring message rcirc-max-message-length)))) - (rcirc-print process (rcirc-nick process) response - (rcirc-get-buffer-create process target) - text) + (rcirc-get-buffer-create process target) + (rcirc-print process (rcirc-nick process) response target text) (rcirc-send-string process (concat response " " target " :" text)) - (if more - (rcirc-send-message process target more noticep)))) + (when more (rcirc-send-message process target more noticep)))) (defvar rcirc-input-ring nil) (defvar rcirc-input-ring-index 0) @@ -582,10 +590,6 @@ If buffer is nil, return the target of the current buffer." (define-key rcirc-mode-map (kbd "C-c C-s") 'rcirc-switch-to-server-buffer) (define-key rcirc-mode-map (kbd "C-c C-a") 'rcirc-jump-to-first-unread-line) -(define-key global-map (kbd "C-c `") 'rcirc-next-active-buffer) -(define-key global-map (kbd "C-c C-@") 'rcirc-next-active-buffer) -(define-key global-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer) - (defvar rcirc-browse-url-map (make-sparse-keymap) "Keymap used for browsing URLs in `rcirc-mode'.") @@ -730,8 +734,6 @@ This is used for the initial name given to IRC buffers." (defun rcirc-get-buffer (process target &optional server) "Return the buffer associated with the PROCESS and TARGET. -If TARGET is nil, return the server buffer. - If optional argument SERVER is non-nil, return the server buffer if there is no existing buffer for TARGET, otherwise return nil." (with-rcirc-process-buffer process @@ -744,7 +746,11 @@ if there is no existing buffer for TARGET, otherwise return nil." "Return the buffer associated with the PROCESS and TARGET. Create the buffer if it doesn't exist." (let ((buffer (rcirc-get-buffer process target))) - (or buffer + (if buffer + (progn + (when (not rcirc-target) + (setq rcirc-target target)) + buffer) ;; create the buffer (with-rcirc-process-buffer process (let ((new-buffer (get-buffer-create @@ -781,36 +787,45 @@ Create the buffer if it doesn't exist." (delete-backward-char 1)) (let ((input (buffer-substring-no-properties rcirc-prompt-end-marker (point)))) - ;; process a /cmd - (if (string-match "^/\\([^ ]+\\) ?\\(.*\\)$" input) - (let* ((command (match-string 1 input)) - (fun (intern-soft (concat "rcirc-cmd-" command))) - (args (match-string 2 input))) - (newline) - (with-current-buffer (current-buffer) - (delete-region rcirc-prompt-end-marker (point)) - (if (string= command "me") - (rcirc-print rcirc-process (rcirc-nick rcirc-process) - "ACTION" (current-buffer) args) - (rcirc-print rcirc-process (rcirc-nick rcirc-process) - "COMMAND" (current-buffer) input)) - (set-marker rcirc-prompt-end-marker (point)) - (if (fboundp fun) - (funcall fun args rcirc-process target) - (rcirc-send-string rcirc-process - (concat command " " args))))) - ;; send message to server - (if (not rcirc-target) - (message "Not joined") - (delete-region rcirc-prompt-end-marker (point)) - (mapc (lambda (message) - (rcirc-send-message rcirc-process target message)) - (split-string input "\n")))) + (dolist (line (split-string input "\n")) + (rcirc-process-input-line rcirc-process target line)) ;; add to input-ring (save-excursion (ring-insert rcirc-input-ring input) (setq rcirc-input-ring-index 0))))))) +(defun rcirc-process-input-line (process target line) + (if (string-match "^/\\([^ ]+\\) ?\\(.*\\)$" line) + (rcirc-process-command (match-string 1 line) + (match-string 2 line) + line) + (rcirc-process-message line))) + +(defun rcirc-process-message (line) + (if (not rcirc-target) + (message "Not joined") + (delete-region rcirc-prompt-end-marker (point)) + (rcirc-send-message rcirc-process rcirc-target line))) + +(defun rcirc-process-command (command args line) + (if (eq (aref command 0) ?/) + ;; "//text" will send "/text" as a message + (rcirc-process-message (substring line 1)) + (let* ((fun (intern-soft (concat "rcirc-cmd-" command)))) + (newline) + (with-current-buffer (current-buffer) + (delete-region rcirc-prompt-end-marker (point)) + (if (string= command "me") + (rcirc-print rcirc-process (rcirc-nick rcirc-process) + "ACTION" rcirc-target args) + (rcirc-print rcirc-process (rcirc-nick rcirc-process) + "COMMAND" rcirc-target line)) + (set-marker rcirc-prompt-end-marker (point)) + (if (fboundp fun) + (funcall fun args rcirc-process rcirc-target) + (rcirc-send-string rcirc-process + (concat command " " args))))))) + (defvar rcirc-parent-buffer nil) (defvar rcirc-window-configuration nil) (defun rcirc-edit-multiline () @@ -828,7 +843,8 @@ Create the buffer if it doesn't exist." (setq rcirc-parent-buffer parent) (setq rcirc-process process) (insert text) - (and (> pos 0) (goto-char pos))))) + (and (> pos 0) (goto-char pos)) + (message "Type C-c C-c to return text to %s, or C-c C-k to cancel" parent)))) (define-derived-mode rcirc-multiline-edit-mode text-mode "rcirc multi" @@ -894,13 +910,15 @@ Create the buffer if it doesn't exist." (t (setq first "[" middle " " end "]"))) (concat first - (rcirc-facify (rcirc-user-nick sender) + (rcirc-facify (concat + sender + (when target (concat "," target))) (if (string= sender (rcirc-nick process)) 'rcirc-my-nick 'rcirc-other-nick)) - middle - (rcirc-mangle-text process text) + middle + (rcirc-mangle-text process text) end))) ((string= response "COMMAND") text) @@ -914,31 +932,41 @@ Create the buffer if it doesn't exist." (rcirc-facify (concat (when (not (string= sender (rcirc-server process))) - (concat (rcirc-user-nick sender) " ")) + (concat sender " ")) (when (zerop (string-to-number response)) (concat response " ")) text) 'rcirc-server))))))) +(defun rcirc-target-buffer (process sender response target text) + "Return a buffer to print the server response." + (assert (not (bufferp target))) + (with-rcirc-process-buffer process + (cond ((not target) + (if rcirc-always-use-server-buffer-flag + (process-buffer process) + (rcirc-get-any-buffer process))) + ((not (rcirc-channel-p target)) + ;; message from another user + (if (string= response "PRIVMSG") + (rcirc-get-buffer-create process (if (string= sender rcirc-nick) + target + sender)) + (rcirc-get-buffer process target t))) + ((or (rcirc-get-buffer process target) + (rcirc-get-any-buffer process)))))) + (defvar rcirc-activity-type nil) (make-variable-buffer-local 'rcirc-activity-type) (defun rcirc-print (process sender response target text &optional activity) "Print TEXT in the buffer associated with TARGET. Format based on SENDER and RESPONSE. If ACTIVITY is non-nil, record activity." - (unless (or (member (rcirc-user-nick sender) rcirc-ignore-list) + (unless (or (member sender rcirc-ignore-list) (member (with-syntax-table rcirc-nick-syntax-table (when (string-match "^\\([^/]\\w*\\)[:,]" text) (match-string 1 text))) rcirc-ignore-list)) - (let* ((buffer (cond ((bufferp target) - target) - ((not target) - (rcirc-get-any-buffer process)) - ((not (rcirc-channel-p target)) - (rcirc-get-buffer-create process - (rcirc-user-nick sender))) - ((or (rcirc-get-buffer process target) - (rcirc-get-any-buffer process))))) + (let* ((buffer (rcirc-target-buffer process sender response target text)) (inhibit-read-only t)) (with-current-buffer buffer (let ((moving (= (point) rcirc-prompt-end-marker)) @@ -961,7 +989,7 @@ record activity." (set-marker-insertion-type rcirc-prompt-start-marker t) (set-marker-insertion-type rcirc-prompt-end-marker t) (insert - (rcirc-format-response-string process sender response target text) + (rcirc-format-response-string process sender response nil text) (propertize "\n" 'hard t)) (set-marker-insertion-type rcirc-prompt-start-marker nil) (set-marker-insertion-type rcirc-prompt-end-marker nil) @@ -978,10 +1006,10 @@ record activity." 0) (cond ((or (string= response "PRIVMSG") (string= response "NOTICE")) - (+ (length (rcirc-user-nick sender)) + (+ (length sender) 2)) ; <> ((string= response "ACTION") - (+ (length (rcirc-user-nick sender)) + (+ (length sender) 1)) ; [ (t 3)) ; *** 1) @@ -1056,17 +1084,17 @@ record activity." (defun rcirc-join-channels (process channels) "Join CHANNELS." (save-window-excursion - (mapc (lambda (channel) - (with-rcirc-process-buffer process - (rcirc-cmd-join channel process))) - channels))) + (dolist (channel channels) + (with-rcirc-process-buffer process + (rcirc-cmd-join channel process))))) ;;; nick management (defun rcirc-user-nick (user) "Return the nick from USER. Remove any non-nick junk." - (if (string-match "^[@%+]?\\([^! ]+\\)!?" (or user "")) - (match-string 1 user) - user)) + (save-match-data + (if (string-match "^[@%+]?\\([^! ]+\\)!?" (or user "")) + (match-string 1 user) + user))) (defun rcirc-user-non-nick (user) "Return the non-nick portion of USER." @@ -1076,17 +1104,15 @@ record activity." (defun rcirc-nick-channels (process nick) "Return list of channels for NICK." - (let ((nick (rcirc-user-nick nick))) - (with-rcirc-process-buffer process - (mapcar (lambda (x) (car x)) - (gethash nick rcirc-nick-table))))) + (with-rcirc-process-buffer process + (mapcar (lambda (x) (car x)) + (gethash nick rcirc-nick-table)))) (defun rcirc-put-nick-channel (process nick channel) "Add CHANNEL to list associated with NICK." (with-rcirc-process-buffer process - (let* ((nick (rcirc-user-nick nick)) - (chans (gethash nick rcirc-nick-table)) - (record (assoc-string channel chans t))) + (let* ((chans (gethash nick rcirc-nick-table)) + (record (assoc-string channel chans t))) (if record (setcdr record (current-time)) (puthash nick (cons (cons channel (current-time)) @@ -1101,8 +1127,7 @@ record activity." (defun rcirc-remove-nick-channel (process nick channel) "Remove the CHANNEL from list associated with NICK." (with-rcirc-process-buffer process - (let* ((nick (rcirc-user-nick nick)) - (chans (gethash nick rcirc-nick-table)) + (let* ((chans (gethash nick rcirc-nick-table)) (newchans ;; instead of assoc-string-delete-all: (let ((record (assoc-string channel chans t))) @@ -1136,28 +1161,44 @@ if NICK is also on `rcirc-ignore-list-automatic'." (delete nick rcirc-ignore-list)))) ;;; activity tracking +(defvar rcirc-track-minor-mode-map (make-sparse-keymap) + "Keymap for rcirc track minor mode.") + +(define-key rcirc-track-minor-mode-map (kbd "C-c `") 'rcirc-next-active-buffer) +(define-key rcirc-track-minor-mode-map (kbd "C-c C-@") 'rcirc-next-active-buffer) +(define-key rcirc-track-minor-mode-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer) + +;;; FIXME: the code to insert `rcirc-activity-string' into +;;; `global-mode-string' isn't called when the mode is activated by +;;; customize. I don't know how to set that up. +(define-minor-mode rcirc-track-minor-mode + "Global minor mode for tracking activity in rcirc buffers." + :init-value nil + :lighter "" + :keymap rcirc-track-minor-mode-map + :global t + :group 'rcirc + (or global-mode-string (setq global-mode-string '(""))) + ;; toggle the mode-line channel indicator + (if rcirc-track-minor-mode + (and (not (memq 'rcirc-activity-string global-mode-string)) + (setq global-mode-string + (append global-mode-string '(rcirc-activity-string)))) + (setq global-mode-string + (delete 'rcirc-activity-string global-mode-string)))) + (or (assq 'rcirc-ignore-buffer-activity-flag minor-mode-alist) (setq minor-mode-alist (cons '(rcirc-ignore-buffer-activity-flag " Ignore") minor-mode-alist))) -(defun rcirc-toggle-ignore-buffer-activity (&optional all) - "Toggle the value of `rcirc-ignore-buffer-activity-flag'. -If ALL is non-nil, instead toggle the value of -`rcirc-ignore-all-activity-flag'." - (interactive "P") - (if all - (progn - (setq rcirc-ignore-all-activity-flag - (not rcirc-ignore-all-activity-flag)) - (message (if rcirc-ignore-all-activity-flag - "Hide all buffer activity" - "Display buffer activity")) - (rcirc-update-activity-string)) - (setq rcirc-ignore-buffer-activity-flag - (not rcirc-ignore-buffer-activity-flag)) - (message (if rcirc-ignore-buffer-activity-flag - "Ignore activity in this buffer" - "Notice activity in this buffer"))) +(defun rcirc-toggle-ignore-buffer-activity () + "Toggle the value of `rcirc-ignore-buffer-activity-flag'." + (interactive) + (setq rcirc-ignore-buffer-activity-flag + (not rcirc-ignore-buffer-activity-flag)) + (message (if rcirc-ignore-buffer-activity-flag + "Ignore activity in this buffer" + "Notice activity in this buffer")) (force-mode-line-update)) (defvar rcirc-switch-to-buffer-function 'switch-to-buffer @@ -1229,21 +1270,18 @@ activity. Only run if the buffer is not visible and (defun rcirc-update-activity-string () "Update mode-line string." (setq rcirc-activity-string - (cond (rcirc-ignore-all-activity-flag - " DND") - ((not rcirc-activity) - "") - (t - (concat " [" - (mapconcat - (lambda (b) - (let ((s (rcirc-short-buffer-name b))) - (with-current-buffer b - (if (not (eq rcirc-activity-type 'nick)) - s - (rcirc-facify s 'rcirc-mode-line-nick))))) - rcirc-activity ",") - "]"))))) + (if (not rcirc-activity) + "" + (concat " [" + (mapconcat + (lambda (b) + (let ((s (rcirc-short-buffer-name b))) + (with-current-buffer b + (if (not (eq rcirc-activity-type 'nick)) + s + (rcirc-facify s 'rcirc-mode-line-nick))))) + rcirc-activity ",") + "]")))) (defun rcirc-short-buffer-name (buffer) "Return a short name for BUFFER to use in the modeline indicator." @@ -1488,23 +1526,22 @@ Ignore NICK, unignore NICK if already ignored, or list ignored nicks when no NICK is given. When listing ignored nicks, the ones added to the list automatically are marked with an asterisk." (interactive "sToggle ignoring of nick: ") - (if (string= "" nick) - (rcirc-print process (rcirc-nick process) "NOTICE" target - (mapconcat - (lambda (nick) - (concat nick - (if (member nick rcirc-ignore-list-automatic) - "*" ""))) - rcirc-ignore-list " ")) + (when (not (string= "" nick)) (if (member nick rcirc-ignore-list) (setq rcirc-ignore-list (delete nick rcirc-ignore-list)) - (setq rcirc-ignore-list (cons nick rcirc-ignore-list))))) - + (setq rcirc-ignore-list (cons nick rcirc-ignore-list)))) + (rcirc-print process (rcirc-nick process) "IGNORE" target + (mapconcat + (lambda (nick) + (concat nick + (if (member nick rcirc-ignore-list-automatic) + "*" ""))) + rcirc-ignore-list " "))) (defun rcirc-message-leader (sender face) "Return a string with SENDER propertized with FACE." - (rcirc-facify (concat "<" (rcirc-user-nick sender) "> ") face)) + (rcirc-facify (concat "<" sender "> ") face)) (defun rcirc-facify (string face) "Return a copy of STRING with FACE property added." @@ -1518,8 +1555,8 @@ ones added to the list automatically are marked with an asterisk." "://" (1+ (char "a-zA-Z0-9_.")) (optional ":" (1+ (char "0-9"))))) - (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,")) - (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;")) + (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]")) + (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]")) "Regexp matching URLs. Set to nil to disable URL features in rcirc.") (defun rcirc-browse-url (&optional arg) @@ -1603,7 +1640,7 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." 'mouse-face 'highlight 'keymap rcirc-browse-url-map) string)) - (push (substring string start end) rcirc-urls)) + (push (substring-no-properties string start end) rcirc-urls)) rcirc-url-regexp text)) text) @@ -1627,7 +1664,7 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (defun rcirc-handler-PRIVMSG (process sender args text) (let ((target (if (rcirc-channel-p (car args)) (car args) - (rcirc-user-nick sender))) + sender)) (message (or (cadr args) ""))) (if (string-match "^\C-a\\(.*\\)\C-a$" message) (rcirc-handler-CTCP process target sender (match-string 1 message)) @@ -1650,25 +1687,21 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (match-string 1 message)) (sender (if (string= sender (rcirc-server process)) - (process-buffer process) - (rcirc-user-nick sender)))) + nil ; server notice + sender))) message t)))) - ;; do we need this: - ;;(and sender (rcirc-put-nick-channel process sender target)))) (defun rcirc-handler-WALLOPS (process sender args text) - (let ((target (rcirc-user-nick sender))) - (rcirc-print process sender "WALLOPS" target (car args) t))) + (rcirc-print process sender "WALLOPS" sender (car args) t)) (defun rcirc-handler-JOIN (process sender args text) - (let ((channel (car args)) - (nick (rcirc-user-nick sender))) + (let ((channel (car args))) (rcirc-get-buffer-create process channel) (rcirc-print process sender "JOIN" channel "") ;; print in private chat buffer if it exists - (when (rcirc-get-buffer rcirc-process nick) - (rcirc-print process sender "JOIN" nick channel)) + (when (rcirc-get-buffer rcirc-process sender) + (rcirc-print process sender "JOIN" sender channel)) (rcirc-put-nick-channel process sender channel))) @@ -1695,9 +1728,9 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (setq rcirc-target nil)))))) (defun rcirc-handler-PART (process sender args text) - (rcirc-ignore-update-automatic (rcirc-user-nick sender)) + (rcirc-ignore-update-automatic sender) (rcirc-handler-PART-or-KICK process "PART" - (car args) sender (rcirc-user-nick sender) + (car args) sender sender (cadr args))) (defun rcirc-handler-KICK (process sender args text) @@ -1705,21 +1738,19 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (caddr args))) (defun rcirc-handler-QUIT (process sender args text) - (rcirc-ignore-update-automatic (rcirc-user-nick sender)) - (let ((nick (rcirc-user-nick sender))) - (mapc (lambda (channel) - (rcirc-print process sender "QUIT" channel (apply 'concat args))) - (rcirc-nick-channels process nick)) + (rcirc-ignore-update-automatic sender) + (mapc (lambda (channel) + (rcirc-print process sender "QUIT" channel (apply 'concat args))) + (rcirc-nick-channels process sender)) - ;; print in private chat buffer if it exists - (let ((buffer (rcirc-get-buffer rcirc-process nick))) - (when buffer - (rcirc-print process sender "QUIT" buffer (apply 'concat args)))) + ;; print in private chat buffer if it exists + (when (rcirc-get-buffer rcirc-process sender) + (rcirc-print process sender "QUIT" sender (apply 'concat args))) - (rcirc-nick-remove process nick))) + (rcirc-nick-remove process sender)) (defun rcirc-handler-NICK (process sender args text) - (let* ((old-nick (rcirc-user-nick sender)) + (let* ((old-nick sender) (new-nick (car args)) (channels (rcirc-nick-channels process old-nick))) ;; update list of ignored nicks @@ -1796,9 +1827,8 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." ;; print in private chat buffers if they exist (mapc (lambda (nick) - (let ((existing-buffer (rcirc-get-buffer process nick))) - (when existing-buffer - (rcirc-print process sender "MODE" existing-buffer msg)))) + (when (rcirc-get-buffer process nick) + (rcirc-print process sender "MODE" nick msg))) (cddr args)))) (defun rcirc-get-temp-buffer-create (process channel) @@ -1834,40 +1864,35 @@ FUNCTION takes 3 arguments, MATCH-START, MATCH-END, and STRING." (defun rcirc-authenticate () "Send authentication to process associated with current buffer. -Passwords are read from `rcirc-authinfo-file-name' (which see)." +Passwords are stored in `rcirc-authinfo' (which see)." (interactive) - (let ((password-alist - (with-temp-buffer - (insert-file-contents-literally rcirc-authinfo-file-name) - (goto-char (point-min)) - (read (current-buffer))))) - (with-rcirc-process-buffer rcirc-process - (dolist (i password-alist) - (let ((server (car i)) - (nick (cadr i)) - (method (caddr i)) - (args (cdddr i))) - (when (and (string-match server rcirc-server) - (string-match nick rcirc-nick)) - (cond ((equal method 'nickserv) - (rcirc-send-string - rcirc-process - (concat - "PRIVMSG nickserv :identify " - (car args)))) - ((equal method 'chanserv) - (rcirc-send-string - rcirc-process - (concat - "PRIVMSG chanserv :identify " - (car args) " " (cadr args)))) - ((equal method 'bitlbee) - (rcirc-send-string - rcirc-process - (concat "PRIVMSG #bitlbee :identify " (car args)))) - (t - (message "No %S authentication method defined" - method))))))))) + (with-rcirc-process-buffer rcirc-process + (dolist (i rcirc-authinfo) + (let ((server (car i)) + (nick (caddr i)) + (method (cadr i)) + (args (cdddr i))) + (when (and (string-match server rcirc-server) + (string-match nick rcirc-nick)) + (cond ((equal method 'nickserv) + (rcirc-send-string + rcirc-process + (concat + "PRIVMSG nickserv :identify " + (car args)))) + ((equal method 'chanserv) + (rcirc-send-string + rcirc-process + (concat + "PRIVMSG chanserv :identify " + (cadr args) " " (car args)))) + ((equal method 'bitlbee) + (rcirc-send-string + rcirc-process + (concat "PRIVMSG &bitlbee :identify " (car args)))) + (t + (message "No %S authentication method defined" + method)))))))) (defun rcirc-handler-INVITE (process sender args text) (rcirc-print process sender "INVITE" nil (mapconcat 'identity args " ") t)) @@ -1879,22 +1904,19 @@ Passwords are read from `rcirc-authinfo-file-name' (which see)." (if (string-match "^\\([^ ]+\\) *\\(.*\\)$" text) (let* ((request (upcase (match-string 1 text))) (args (match-string 2 text)) - (nick (rcirc-user-nick sender)) (handler (intern-soft (concat "rcirc-handler-ctcp-" request)))) (if (not (fboundp handler)) - (rcirc-print process sender "ERROR" - (rcirc-get-buffer process target) - (format "%s sent unsupported ctcp: %s" nick text) + (rcirc-print process sender "ERROR" target + (format "%s sent unsupported ctcp: %s" sender text) t) (funcall handler process target sender args) (if (not (string= request "ACTION")) - (rcirc-print process sender "CTCP" - (rcirc-get-buffer process target) + (rcirc-print process sender "CTCP" target (format "%s" text) t)))))) (defun rcirc-handler-ctcp-VERSION (process target sender args) (rcirc-send-string process - (concat "NOTICE " (rcirc-user-nick sender) + (concat "NOTICE " sender " :\C-aVERSION " rcirc-id-string "\C-a"))) @@ -1903,7 +1925,7 @@ Passwords are read from `rcirc-authinfo-file-name' (which see)." (defun rcirc-handler-ctcp-TIME (process target sender args) (rcirc-send-string process - (concat "NOTICE " (rcirc-user-nick sender) + (concat "NOTICE " sender " :\C-aTIME " (current-time-string) "\C-a"))) (defun rcirc-handler-CTCP-response (process target sender message) @@ -1960,7 +1982,7 @@ Passwords are read from `rcirc-authinfo-file-name' (which see)." :group 'rcirc-faces) (defface rcirc-server-prefix ; font-lock-comment-delimiter-face - '((default :inherit font-lock-comment-face) + '((default :inherit rcirc-server) (((class grayscale))) (((class color) (min-colors 16))) (((class color) (min-colors 8) (background light)) From e499d09261b28174761e0f642c3579448fbe24a5 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Wed, 8 Feb 2006 18:05:51 +0000 Subject: [PATCH 10/58] Add myself to the list. --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d2fda5ed700..92c2ff70b47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -65,6 +65,12 @@ Miles Bader lisp/minibuf-eldef.el lisp/rfn-eshadow.el +Jay Belanger + Calc + lisp/calc/* + etc/calccard.tex + man/calc.texi + ============================================================================== 2. ============================================================================== From 745cfc57058bf80726961f8e4775b290e308bf7c Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 8 Feb 2006 20:47:24 +0000 Subject: [PATCH 11/58] 2006-02-08 Chong Yidong * mouse.el (mouse-drag-track): Don't change window if we rebind to some other event. --- lisp/ChangeLog | 5 +++++ lisp/mouse.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c03d0171f06..65cbcacd4f7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Chong Yidong + + * mouse.el (mouse-drag-track): Don't change window if we rebind to + some other event. + 2006-02-08 Ryan Yeske * net/rcirc.el (rcirc-startup-channels-alist): Add diff --git a/lisp/mouse.el b/lisp/mouse.el index 4b3b098543c..9922b0f9aed 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -1036,13 +1036,13 @@ should only be used by mouse-drag-region." (if (> mouse-1-click-follows-link 0) (<= (- t1 t0) mouse-1-click-follows-link) (< (- t0 t1) mouse-1-click-follows-link)))))))) - ;; Reselect previous selected window, + ;; If we rebind to mouse-2, reselect previous selected window, ;; so that the mouse-2 event runs in the same ;; situation as if user had clicked it directly. ;; Fixes the bug reported by juri@jurta.org on 2005-12-27. - (select-window original-window) (if (or (vectorp on-link) (stringp on-link)) (setq event (aref on-link 0)) + (select-window original-window) (setcar event 'mouse-2) ;; If this mouse click has never been done by ;; the user, it doesn't have the necessary From 5f7b8867a3290c4116dbac15bdf2a9e3ddbd89a4 Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Wed, 8 Feb 2006 21:58:41 +0000 Subject: [PATCH 12/58] (Top): Remove paragraph about the FAQ being a transitional document, etc. (Searching for/replacing newlines): New node. (Yanking text in isearch): New node. (Inserting text at the beginning of each line): Rename and make more general, mention `M-;' in Message mode. --- man/ChangeLog | 9 +++++++++ man/faq.texi | 53 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/man/ChangeLog b/man/ChangeLog index edd9592722c..4f93bc48498 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,12 @@ +2006-02-08 Romain Francoise + + * faq.texi (Top): Remove paragraph about the FAQ being a + transitional document, etc. + (Searching for/replacing newlines): New node. + (Yanking text in isearch): New node. + (Inserting text at the beginning of each line): Rename and make + more general, mention `M-;' in Message mode. + 2006-02-07 Luc Teirlinck * mule.texi (International): diff --git a/man/faq.texi b/man/faq.texi index 77955d9c1ce..734212758d5 100644 --- a/man/faq.texi +++ b/man/faq.texi @@ -59,12 +59,9 @@ distribution.] This is the GNU Emacs FAQ, last updated on @today{}. -The FAQ is maintained as a Texinfo document, allowing us to create HTML, -Info, and TeX documents from a single source file, and is slowly but -surely being improved. Please bear with us as we improve on this -format. This FAQ is maintained as a part of GNU Emacs. If you find -any errors, or have any suggestions, please use @kbd{M-x report-emacs-bug} -to report them. +This FAQ is maintained as a part of GNU Emacs. If you find any errors, +or have any suggestions, please use @kbd{M-x report-emacs-bug} to report +them. @menu * FAQ notation:: @@ -1177,6 +1174,8 @@ In addition, Emacs 22 now includes the Emacs Lisp Reference Manual * Highlighting a region:: * Controlling case sensitivity:: * Wrapping words automatically:: +* Searching for/replacing newlines:: +* Yanking text in isearch:: * Spell-checkers:: * Checking TeX and *roff documents:: * Changing load-path:: @@ -1195,7 +1194,7 @@ In addition, Emacs 22 now includes the Emacs Lisp Reference Manual * Valid X resources:: * Evaluating Emacs Lisp code:: * Changing the length of a Tab:: -* Inserting > at the beginning of each line:: +* Inserting text at the beginning of each line:: * Underlining paragraphs:: * Repeating a command as many times as possible:: * Forcing the cursor to remain in the same column:: @@ -1534,7 +1533,7 @@ including in your @file{.emacs} file. (Also see @ref{Turning on syntax highlighting}.) -@node Controlling case sensitivity, Wrapping words automatically, Highlighting a region, Common requests +@node Controlling case sensitivity, Searching for/replacing newlines, Highlighting a region, Common requests @section How do I control Emacs's case-sensitivity when searching/replacing? @cindex @code{case-fold-search} @cindex Case sensitivity of searches @@ -1566,7 +1565,23 @@ mode's hook. For example: (setq case-fold-search nil))) @end lisp -@node Wrapping words automatically, Spell-checkers, Controlling case sensitivity, Common requests +@node Searching for/replacing newlines, Yanking text in isearch, Controlling case sensitivity, Common requests +@section How do I input a newline character in isearch or query-replace? +@cindex Searching for newlines +@cindex Replacing newlines + +Use @kbd{C-q C-j}. For more information, see @inforef{Special Isearch, +Special Input for Incremental Search, emacs}. + + +@node Yanking text in isearch, Wrapping words automatically, Searching for/replacing newlines, Common requests +@section How do I copy text from the kill ring into the search string? +@cindex Yanking text into the search string +@cindex isearch yanking + +Use @kbd{M-y}. @inforef{Isearch Yank, Isearch Yanking, emacs}. + +@node Wrapping words automatically, Spell-checkers, Yanking text in isearch, Common requests @section How do I make Emacs wrap words for me? @cindex Wrapping word automatically @cindex Wrapping lines @@ -2102,7 +2117,7 @@ about them. @end itemize -@node Changing the length of a Tab, Inserting > at the beginning of each line, Evaluating Emacs Lisp code, Common requests +@node Changing the length of a Tab, Inserting text at the beginning of each line, Evaluating Emacs Lisp code, Common requests @section How do I change Emacs's idea of the @key{TAB} character's length? @cindex Tab length @cindex Length of tab character @@ -2121,8 +2136,9 @@ Do not confuse variable @code{tab-width} with variable @key{TAB} characters. The latter controls what characters are inserted when you press the @key{TAB} character in certain modes. -@node Inserting > at the beginning of each line, Underlining paragraphs, Changing the length of a Tab, Common requests -@section How do I insert @samp{>} at the beginning of every line? +@node Inserting text at the beginning of each line, Underlining paragraphs, Changing the length of a Tab, Common requests +@section How do I insert at the beginning of every line? +@cindex Prefixing a region with some text @cindex Prefix character, inserting in mail/news replies @cindex Replies to mail/news, inserting a prefix character @cindex @code{mail-yank-prefix} @@ -2130,7 +2146,7 @@ when you press the @key{TAB} character in certain modes. @cindex News replies, inserting a prefix character To do this to an entire buffer, type @kbd{M-< M-x replace-regexp -@key{RET} ^ @key{RET} > @key{RET}}. +@key{RET} ^ @key{RET} your text @key{RET}}. To do this to a region, use @code{string-insert-rectangle}. Set the mark (@kbd{C-@key{SPC}}) at the beginning of the first line you @@ -2139,13 +2155,12 @@ want to prefix, move the cursor to last line to be prefixed, and type buffer, type @kbd{C-x h M-x string-insert-rectangle @key{RET}}. If you are trying to prefix a yanked mail message with @samp{>}, you -might want to set the variable @code{mail-yank-prefix}. Better yet, use -the Supercite package (@pxref{Supercite}), which provides flexible -citation for yanked mail and news messages; it is included in Emacs -since version 19.20. @xref{Changing the included text prefix}, for -additional information. +might want to set the variable @code{mail-yank-prefix}. In Message +buffers, you can even use @kbd{M-;} to cite yanked messages (@kbd{M-;} +runs the function @code{comment-region}, it is a general-purpose +mechanism to comment regions). -@node Underlining paragraphs, Repeating a command as many times as possible, Inserting > at the beginning of each line, Common requests +@node Underlining paragraphs, Repeating a command as many times as possible, Inserting text at the beginning of each line, Common requests @section How do I insert @samp{_^H} before each character in a region to get an underlined paragraph? @cindex Underlining a region of text @cindex @code{underline-region} From 5f64e9f656e0ac717ff840e7cd938b2465bbdac4 Mon Sep 17 00:00:00 2001 From: Mathias Dahl Date: Wed, 8 Feb 2006 23:17:13 +0000 Subject: [PATCH 13/58] Keybindings for Tumme in Dired. --- etc/ChangeLog | 4 ++++ etc/NEWS | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/etc/ChangeLog b/etc/ChangeLog index 3d64ba12cc3..eb2f3f1b633 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2006-02-09 Mathias Dahl + + * NEWS: New key bindings for Tummein Dired. + 2006-02-05 Jay Belanger * calccard.tex: Update copyright year. diff --git a/etc/NEWS b/etc/NEWS index 6fb402b0403..d481776e8cd 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1833,6 +1833,12 @@ boundaries during scrolling. * Changes in Specialized Modes and Packages in Emacs 22.1: +** Changes in Dired +*** Bindings for Tumme added +Several new keybindings, all starting with the C-t prefix, have been +added to Dired. They are all bound to commands in Tumme. As a starting +point, mark some image files in a dired buffer and do C-t d to display +thumbnails of them in a separate buffer. ** Changes in Hi Lock: +++ From d5905ab9153b05107c63731053cf97681d4c61e7 Mon Sep 17 00:00:00 2001 From: Mathias Dahl Date: Thu, 9 Feb 2006 00:02:11 +0000 Subject: [PATCH 14/58] Tumme documentation. --- man/ChangeLog | 4 ++++ man/dired.texi | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/man/ChangeLog b/man/ChangeLog index 4f93bc48498..e5ebb72c2c5 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2006-02-09 Mathias Dahl + + * dired.texi (Tumme): Basic documentation for Tumme added. + 2006-02-08 Romain Francoise * faq.texi (Top): Remove paragraph about the FAQ being a diff --git a/man/dired.texi b/man/dired.texi index a432d681918..be733f9924d 100644 --- a/man/dired.texi +++ b/man/dired.texi @@ -40,6 +40,8 @@ files. * Updating: Dired Updating. Discarding lines for files of no interest. * Find: Dired and Find. Using `find' to choose the files for Dired. * Wdired:: Operating on files by editing the Dired buffer. +* Tumme:: Image file and thumbnail viewing and + manipulation from the Dired buffer. * Misc: Misc Dired Features. Various other features. @end menu @@ -1140,6 +1142,52 @@ you can change @samp{-rw-r--r--} to @samp{-rw-rw-rw-} to make a file world-writable. These changes also take effect when you type @kbd{C-c C-c}. +@node Tumme +@section Thumbnail and image file viewing and manipulation + +@cindex tumme mode + Tumme provides for simple viewing of thumbnails if image files. It +also provides viewing of the original file, sized or in full size, +inside Emacs or in an external viewer. + + Tumme aims to be both easy to use for a beginner but also powerful +and useful for an experienced user. + + To try out Tumme, mark some image files in Dired and type @kbd{C-t +d} (@code{tumme-display-thumbs}). With point in the thumbnail buffer, +type @kbd{RET} (@code{tumme-display-thumbnail-original-image}) to +display a sized version of it. Use the keys to move around in the +buffer. For easy browing, type @kbd{SPC} +(@code{tumme-display-next-thumbnail-original}) to advance and display +the next image. Typing @kbd{SPC} +(@code{tumme-display-previous-thumbnail-original}) backs up to the +previous thumbnail and displays the image. + + If you want to see the image in its original size, either provide a +prefix argument (@kbd{C-u}) before pressing @kbd{RET}, or type +@kbd{C-return} (@code{tumme-thumbnail-display-external}) to display +the image in an external viewer. + + If you find in image that you want to delete, type @kbd{d} +(@code{tumme-flag-thumb-original-file}) and the file will be flagged +for deletion in the dired buffer. If you just want to delete the +thumbnail image from the thumbnail buffer, type @kbd{C-d} +(@code{tumme-delete-char}). + + More advanced features include commands for using ``tags'' (labels, +or categories) to tag image files and to search for image files with a +certain tag. + + The tags put on image files are stored in a database file and can be +used for marking image files. For example, you can let Tumme mark all +files in the current directory tagged with the tag `flowers'. To tag +image files, mark them in the dired buffer and type @kbd{C-t t} +(@code{tumme-tag-files}). To mark files having a certain tag, type +@kbd{C-t f} (@code{tumme-mark-tagged-files}). + + Tumme also provide simple image manipulation commands, like rotating +thumbnails and original image files. + @node Misc Dired Features @section Other Dired Features From ddd1e91e60b58cfcc553236f75f4cbadef71244c Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 9 Feb 2006 01:36:22 +0000 Subject: [PATCH 15/58] (hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil. --- lisp/ChangeLog | 5 +++++ lisp/hilit-chg.el | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 65cbcacd4f7..a0718768996 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-09 Juanma Barranquero + + * hilit-chg.el (hilit-chg-update-all-buffers): Use `mapc' instead of + `mapcar'; return nil. + 2006-02-08 Chong Yidong * mouse.el (mouse-drag-track): Don't change window if we rebind to diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index a68e20cf6de..6bea0ad4b4b 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -521,7 +521,7 @@ the text properties of type `hilit-chg'." This allows you to manually remove highlighting from uninteresting changes." (interactive "r") (let ((after-change-functions nil)) - (remove-text-properties beg end '(hilit-chg nil)) + (remove-text-properties beg end '(hilit-chg nil)) (hilit-chg-fixup beg end))) (defun hilit-chg-set-face-on-change (beg end leng-before @@ -662,7 +662,7 @@ Hook variables: ;; an argument is given ((eq arg 'active) 'active) - ((eq arg 'passive) + ((eq arg 'passive) 'passive) ((> (prefix-numeric-value arg) 0) 'active) @@ -960,9 +960,9 @@ changes are made, so \\[highlight-changes-next-change] and ;; which calls this function as a hook (defvar x) ;; placate the byte-compiler (defvar y) - (setq e (current-buffer)) + (setq e (current-buffer)) (let ((n 0) extent p va vb a b) - (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info + (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info (while (< n ediff-number-of-differences) (ediff-make-fine-diffs n) (setq va (ediff-get-fine-diff-vector n 'A)) @@ -1085,7 +1085,7 @@ variable `highlight-changes-global-changes-existing-buffers' is non-nil). (progn (if (eq arg 'active) (setq highlight-changes-global-initial-state 'active) - (if (eq arg 'passive) + (if (eq arg 'passive) (setq highlight-changes-global-initial-state 'passive))) (setq global-highlight-changes t) (message "Turning ON Global Highlight Changes mode in %s state" @@ -1131,7 +1131,7 @@ from `global-highlight-changes' when turning on global Highlight Changes mode." (memq major-mode highlight-changes-global-modes))) (t (and - (not (string-match "^[ *]" (buffer-name))) + (not (string-match "^[ *]" (buffer-name))) (buffer-file-name)))) (progn (hilit-chg-set value) @@ -1146,14 +1146,15 @@ from `global-highlight-changes' when turning on global Highlight Changes mode." (defun hilit-chg-update-all-buffers (value) - (mapcar + (mapc (function (lambda (buffer) (with-current-buffer buffer (if value (hilit-chg-turn-on-maybe value) (hilit-chg-turn-off-maybe)) ))) - (buffer-list))) + (buffer-list)) + nil) ;;;; Desktop support. From bf54d814520785e8299cfe6d7ce445304703b492 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 9 Feb 2006 03:47:00 +0000 Subject: [PATCH 16/58] (vc-svn-print-log): Show recent commits as well. --- lisp/ChangeLog | 13 ++++++++----- lisp/vc-svn.el | 6 +++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a0718768996..63fb4667cd1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-02-08 Peter Doornbosch (tiny change) + + * vc-svn.el (vc-svn-print-log): Show recent commits as well. + 2006-02-09 Juanma Barranquero * hilit-chg.el (hilit-chg-update-all-buffers): Use `mapc' instead of @@ -10,8 +14,8 @@ 2006-02-08 Ryan Yeske - * net/rcirc.el (rcirc-startup-channels-alist): Add - irc.freenode.net and #emacs as defaults. + * net/rcirc.el (rcirc-startup-channels-alist): + Add irc.freenode.net and #emacs as defaults. (rcirc-ignore-all-activity-flag): Remove variable. (rcirc-authinfo): New variable. (rcirc-authinfo-filename): Remove variable. @@ -31,9 +35,8 @@ messages. (rcirc-user-nick): Save match data. (rcirc-toggle-ignore-buffer-activity) - (rcirc-update-activity-string): Remove global ignore - functionality, which can be done now by toggling - rcirc-track-minor-mode. + (rcirc-update-activity-string): Remove global ignore functionality, + which can be done now by toggling rcirc-track-minor-mode. (rcirc-track-minor-mode-map): New keymap. (rcirc-track-minor-mode): New minor-mode. (ignore): Make the ignore output nicer. Always print it when diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 82942f78358..6d27c5c6a7e 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -370,7 +370,11 @@ The changes are between FIRST-VERSION and SECOND-VERSION." (vc-svn-command buffer (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0) - file "log"))) + file "log" + ;; By default Subversion only shows the log upto the working version, + ;; whereas we also want the log of the subsequent commits. At least + ;; that's what the vc-cvs.el code does. + "-rHEAD:0"))) (defun vc-svn-diff (file &optional oldvers newvers buffer) "Get a difference report using SVN between two versions of FILE." From 909e3b3323035616155f5e8fd833c5a1431fe448 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 9 Feb 2006 10:49:59 +0000 Subject: [PATCH 17/58] (Fmake_bool_vector, Fpurecopy): Doc fixes. --- src/alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/alloc.c b/src/alloc.c index 01c12f954b7..0276f85f1fe 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -2299,7 +2299,7 @@ INIT must be an integer that represents a character. */) DEFUN ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0, - doc: /* Return a new bool-vector of length LENGTH, using INIT for as each element. + doc: /* Return a new bool-vector of length LENGTH, using INIT for each element. LENGTH must be a number. INIT matters only in whether it is t or nil. */) (length, init) Lisp_Object length, init; @@ -4811,7 +4811,7 @@ make_pure_vector (len) DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0, - doc: /* Make a copy of OBJECT in pure storage. + doc: /* Make a copy of object OBJ in pure storage. Recursively copies contents of vectors and cons cells. Does not copy symbols. Copies strings without text properties. */) (obj) From cffc347298b84976c6c14a75aeb90763f4a5fdca Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 9 Feb 2006 10:58:39 +0000 Subject: [PATCH 18/58] *** empty log message *** --- src/ChangeLog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 40d498b5d47..3b4de953a65 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-02-09 Juanma Barranquero + + * alloc.c (Fmake_bool_vector, Fpurecopy): Doc fixes. + 2006-02-08 Jan Dj,Ad(Brv * window.c (adjust_window_trailing_edge): Check that shrinking @@ -6,7 +10,7 @@ 2006-02-08 Miles Bader * editfns.c (Fconstrain_to_field): Use Fget_char_property instead - of Fget_text_property (other field functions word with overlays as + of Fget_text_property (other field functions work with overlays as well as text-properties). 2006-02-07 Kenichi Handa From 2ccc6e66057d3893c7553d3ae1aa812f8001adad Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 9 Feb 2006 13:35:52 +0000 Subject: [PATCH 19/58] Typo. --- etc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index eb2f3f1b633..70295a93eeb 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,6 +1,6 @@ 2006-02-09 Mathias Dahl - * NEWS: New key bindings for Tummein Dired. + * NEWS: New key bindings for Tumme in Dired. 2006-02-05 Jay Belanger From a8f116e70072f0eb29e7f2ee14c13a79e220e41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Thu, 9 Feb 2006 15:54:56 +0000 Subject: [PATCH 20/58] handle_one_xevent: Must note mouse movement even for nil frames for GTK, in that case it is the tool bar. --- src/xterm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/xterm.c b/src/xterm.c index 114a7f12459..e3407dcaaec 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -6495,6 +6495,12 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) so update things that depend on mouse position. */ if (f && !f->output_data.x->hourglass_p) note_mouse_movement (f, &event.xmotion); +#ifdef USE_GTK + /* We may get an EnterNotify on the buttons in the toolbar. In that + case we moved out of any highlighted area and need to note this. */ + if (!f && last_mouse_glyph_frame) + note_mouse_movement (last_mouse_glyph_frame, &event); +#endif goto OTHER; case FocusIn: @@ -6522,6 +6528,11 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) if (any_help_event_p) do_help = -1; } +#ifdef USE_GTK + /* See comment in EnterNotify above */ + else if (last_mouse_glyph_frame) + note_mouse_movement (last_mouse_glyph_frame, &event); +#endif goto OTHER; case FocusOut: From 1834d8e7d58516e7a4d8d1750ab531ba32aba8a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Thu, 9 Feb 2006 15:56:43 +0000 Subject: [PATCH 21/58] * xterm.c (handle_one_xevent): Must note mouse movement even for nil frames for GTK, in that case it is the tool bar. This is so that highlighted text get reset properly. --- src/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 3b4de953a65..b7124f33d83 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2006-02-09 Jan Dj,Ad(Brv + + * xterm.c (handle_one_xevent): Must note mouse movement even for nil + frames for GTK, in that case it is the tool bar. This is so that + highlighted text get reset properly. + 2006-02-09 Juanma Barranquero * alloc.c (Fmake_bool_vector, Fpurecopy): Doc fixes. From 613cd8c53f1342b4a3ecc8a96a37b3ceb6623281 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Thu, 9 Feb 2006 19:06:33 +0000 Subject: [PATCH 22/58] (mh-replace-regexp-in-string): Add missing regexp argument. --- lisp/mh-e/ChangeLog | 5 +++++ lisp/mh-e/mh-compat.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index de73f331aa0..b89a4fc3d1f 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,8 @@ +2006-02-09 Bill Wohler + + * mh-compat.el(mh-replace-regexp-in-string): Add missing regexp + argument. + 2006-02-08 Peter S Galbraith * mh-e.el (mh-invisible-header-fields-internal): Added entries diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index 1d7f1c90e79..090ee51c5fc 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -144,7 +144,7 @@ The argument STRING is ignored." (match-beginning num) (match-end num))) (mh-defun-compat mh-replace-regexp-in-string replace-regexp-in-string - (rep string &optional fixedcase literal subexp start) + (regexp rep string &optional fixedcase literal subexp start) "Replace REGEXP with REP everywhere in STRING and return result. This function is used by XEmacs that lacks `replace-regexp-in-string'. The function `replace-in-string' is used instead. From d9674f335bfb0ff92c8a2cfa7d4f04ffc1ca2b7e Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Thu, 9 Feb 2006 19:15:46 +0000 Subject: [PATCH 23/58] (autoconf-font-lock-keywords): Check start boundary of symbols. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/autoconf.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 63fb4667cd1..8ed1d26e7c2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-09 Masatake YAMATO + + * progmodes/autoconf.el (autoconf-font-lock-keywords): Check start + boundary of symbols. + 2006-02-08 Peter Doornbosch (tiny change) * vc-svn.el (vc-svn-print-log): Show recent commits as well. diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index 2949b2da92f..97cf21d175e 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -52,7 +52,7 @@ "AC_\\(SUBST\\|DEFINE\\(_UNQUOTED\\)?\\)(\\(\\sw+\\)") (defvar autoconf-font-lock-keywords - `(("A[CHMS]_\\sw+" . font-lock-keyword-face) + `(("\\_ Date: Thu, 9 Feb 2006 19:20:46 +0000 Subject: [PATCH 24/58] (dired-guess-shell-alist-default): Add .man as a `dired-man' target. --- lisp/ChangeLog | 3 +++ lisp/dired-x.el | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ed1d26e7c2..e5cc3af773c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2006-02-09 Masatake YAMATO + * dired-x.el (dired-guess-shell-alist-default): Add .man as + a `dired-man' target. + * progmodes/autoconf.el (autoconf-font-lock-keywords): Check start boundary of symbols. diff --git a/lisp/dired-x.el b/lisp/dired-x.el index da9fc284801..e207c60502d 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -1027,11 +1027,11 @@ dired." " " dired-guess-shell-znew-switches)) ;; The following four extensions are useful with dired-man ("N" key) - (list "\\.[0-9]$" '(progn (require 'man) + (list "\\.\\(?:[0-9]\\|man\\)$" '(progn (require 'man) (if (Man-support-local-filenames) "man -l" "cat * | tbl | nroff -man -h"))) - (list "\\.[0-9]\\.g?z$" '(progn (require 'man) + (list "\\.\\(?:[0-9]\\|man\\)\\.g?z$" '(progn (require 'man) (if (Man-support-local-filenames) "man -l" "gunzip -qc * | tbl | nroff -man -h")) From fcfc4732e0d93a6ad6ce11b79ddd372cf8ae738b Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 9 Feb 2006 19:34:08 +0000 Subject: [PATCH 25/58] * image-mode.el (image-toggle-display): Clear image cache if using filename. --- lisp/ChangeLog | 5 +++++ lisp/image-mode.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5cc3af773c..eb76a4bc56d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-09 Chong Yidong + + * image-mode.el (image-toggle-display): Clear image cache if using + filename. + 2006-02-09 Masatake YAMATO * dired-x.el (dired-guess-shell-alist-default): Add .man as diff --git a/lisp/image-mode.el b/lisp/image-mode.el index e49ca27db72..258f852a4d6 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -140,7 +140,8 @@ and showing the image as an image." (let* ((image (if (and (buffer-file-name) (not (buffer-modified-p))) - (create-image (buffer-file-name)) + (progn (clear-image-cache) + (create-image (buffer-file-name))) (create-image (string-make-unibyte (buffer-substring-no-properties (point-min) (point-max))) From da01a066b9a9f5a487ae4dc67767bef7b62346bc Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Thu, 9 Feb 2006 19:53:44 +0000 Subject: [PATCH 26/58] (mh-folder-list): Don't replace "/*$" with "/" since that causes an infinite loop on XEmacs. --- lisp/mh-e/ChangeLog | 3 +++ lisp/mh-e/mh-utils.el | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index b89a4fc3d1f..19cffeabacb 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,5 +1,8 @@ 2006-02-09 Bill Wohler + * mh-utils.el (mh-folder-list): Don't replace "/*$" with "/" since + that causes an infinite loop on XEmacs. + * mh-compat.el(mh-replace-regexp-in-string): Add missing regexp argument. diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el index 42f11376262..dc86d19ae77 100644 --- a/lisp/mh-e/mh-utils.el +++ b/lisp/mh-e/mh-utils.el @@ -516,13 +516,15 @@ value of `mh-recursive-folders-flag'. If this flag is nil, and the sub-folders have not been explicitly viewed, then they will not be returned." (let ((folder-list)) - ;; Normalize folder. Strip leading +. Add trailing slash. If no - ;; folder is specified, ensure it is nil to ensure we get the - ;; top-level folders; otherwise mh-sub-folders returns all the - ;; files in / if given an empty string or +. + ;; Normalize folder. Strip leading +. Add trailing slash (done in + ;; two steps to avoid infinite loops when replacing "/*$" with "/" + ;; in XEmacs). If no folder is specified, ensure it is nil to + ;; ensure we get the top-level folders; otherwise mh-sub-folders + ;; returns all the files in / if given an empty string or +. (when folder (setq folder (mh-replace-regexp-in-string "^\+" "" folder)) - (setq folder (mh-replace-regexp-in-string "/*$" "/" folder)) + (setq folder (mh-replace-regexp-in-string "/+$" "" folder)) + (setq folder (concat folder "/")) (if (equal folder "") (setq folder nil))) (loop for f in (mh-sub-folders folder) do From 1bf6d4b5c112dbf6233ff2cfc3b85adfa6cbd291 Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Thu, 9 Feb 2006 20:10:53 +0000 Subject: [PATCH 27/58] *** empty log message *** --- lisp/ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eb76a4bc56d..81b031fe0a4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,8 +7,8 @@ * dired-x.el (dired-guess-shell-alist-default): Add .man as a `dired-man' target. - - * progmodes/autoconf.el (autoconf-font-lock-keywords): Check start + + * progmodes/autoconf.el (autoconf-font-lock-keywords): Check start boundary of symbols. 2006-02-08 Peter Doornbosch (tiny change) From 9e72206753821fb379babd1e10e124616d3ff4a7 Mon Sep 17 00:00:00 2001 From: Lars Hansen Date: Thu, 9 Feb 2006 21:01:19 +0000 Subject: [PATCH 28/58] Add highlight-changes-mode to desktop-locals-to-save. (highlight-changes-mode): Don't change desktop-locals-to-save. --- lisp/ChangeLog | 6 ++++++ lisp/hilit-chg.el | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 81b031fe0a4..82d834ce6c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-02-09 Lars Hansen + + * hilit-chg.el: Add highlight-changes-mode to + desktop-locals-to-save. + (highlight-changes-mode): Don't change desktop-locals-to-save. + 2006-02-09 Chong Yidong * image-mode.el (image-toggle-display): Clear image cache if using diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 6bea0ad4b4b..d6408412c0b 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -673,7 +673,6 @@ Hook variables: (if new-highlight-changes-mode ;; mode is turned on -- but may be passive (progn - (add-to-list 'desktop-locals-to-save 'highlight-changes-mode) (hilit-chg-set new-highlight-changes-mode) (or was-on ;; run highlight-changes-enable-hook once @@ -1166,6 +1165,8 @@ from `global-highlight-changes' when turning on global Highlight Changes mode." (add-to-list 'desktop-minor-mode-handlers '(highlight-changes-mode . hilit-chg-desktop-restore)) +(add-to-list 'desktop-locals-to-save 'highlight-changes-mode) + ;; ===================== debug ================== ;; For debug & test use: ;; From 85249e52dc52fe130b2a1aee29a88c1165c1b5b1 Mon Sep 17 00:00:00 2001 From: Mathias Dahl Date: Thu, 9 Feb 2006 22:43:39 +0000 Subject: [PATCH 29/58] Added a few todo items. --- lisp/tumme.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/tumme.el b/lisp/tumme.el index 005258790c2..2fd4a09777a 100644 --- a/lisp/tumme.el +++ b/lisp/tumme.el @@ -524,10 +524,16 @@ ;; files. ;; ;; * From thumbs.el: Add an option for clean-up/max-size functionality -;; for thumbnail directory. +;; for thumbnail directory. ;; ;; * From thumbs.el: Add setroot function. ;; +;; * From thumbs.el: Add image resizing, if useful (tumme's automatic +;; "image fit" might be enough) +;; +;; * From thumbs.el: Add the "modify" commands (emboss, negate, +;; monochrome etc). +;; ;; * Asynchronous creation of thumbnails. ;; ;; * Add `tumme-display-thumbs-ring' and functions to cycle that. Find From d03b98ade939c814718d1f966ae3edceb6762548 Mon Sep 17 00:00:00 2001 From: Mathias Dahl Date: Thu, 9 Feb 2006 22:56:00 +0000 Subject: [PATCH 30/58] *** empty log message *** --- lisp/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 82d834ce6c8..fca44928835 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-02-09 Mathias Dahl + + * tumme.el: Added a couple of todo items. + 2006-02-09 Lars Hansen * hilit-chg.el: Add highlight-changes-mode to From 13664bec59d325535eb280ed3fe2b8a69d5b6876 Mon Sep 17 00:00:00 2001 From: Mathias Dahl Date: Thu, 9 Feb 2006 23:07:54 +0000 Subject: [PATCH 31/58] *** empty log message *** --- lisp/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fca44928835..0ee349bbf06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 Mathias Dahl + + * tumme.el (tumme-copy-with-exif-file-name): Tried to make + docstring less `colloquial'... + 2006-02-09 Mathias Dahl * tumme.el: Added a couple of todo items. From 49f18bccba0bc666c50057831862d224639deeb2 Mon Sep 17 00:00:00 2001 From: Mathias Dahl Date: Thu, 9 Feb 2006 23:08:19 +0000 Subject: [PATCH 32/58] Tried to make docstring less `colloquial'... --- lisp/tumme.el | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/lisp/tumme.el b/lisp/tumme.el index 2fd4a09777a..0436a0cb55e 100644 --- a/lisp/tumme.el +++ b/lisp/tumme.el @@ -847,7 +847,7 @@ Used by `tumme-copy-with-exif-file-name'." (defcustom tumme-show-all-from-dir-max-files 50 "*Maximum number of files to show using`tumme-show-all-from-dir'. - before warning the user." +before warning the user." :type 'integer :group 'tumme) @@ -1025,8 +1025,8 @@ Convenience command that: - Set `truncate-lines' to t After the command has finished, you would typically mark some -image files in dired and call `tumme-display-thumbs' (by default -bound to C-t d). +image files in dired and type +\\[tumme-display-thumbs] (`tumme-display-thumbs'). If called with prefix argument ARG, skip splitting of windows. @@ -1119,7 +1119,7 @@ displayed." (and (> (length files) tumme-show-all-from-dir-max-files) (y-or-n-p (format - "Directory contains more than %d image files. Proceed? " + "Directory contains more than %d image files. Proceed? " tumme-show-all-from-dir-max-files)))) (progn (tumme-display-thumbs) @@ -1832,7 +1832,7 @@ Note that n, p and and will be hijacked and bound to (defun tumme-create-thumbs (&optional arg) "Create thumbnail images for all marked files in dired. With prefix argument ARG, create thumbnails even if they already exist -\(i.e. use this to refresh your thumbnails)." +\(i.e. use this to refresh your thumbnails)." (interactive "P") (let (curr-file thumb-name files count) (setq files (dired-get-marked-files)) @@ -2248,21 +2248,17 @@ default value at the prompt." (defun tumme-copy-with-exif-file-name () "Copy file with unique name to main image directory. -Copy current or all marked files in dired to a new file in your main -image directory, using a file name generated by -`tumme-get-exif-file-name'. This might or might not be useful for -other people, but I use it each time I fetch images from my digital -camera, for copying the images into my main image directory. +Copy current or all marked files in dired to a new file in your +main image directory, using a file name generated by +`tumme-get-exif-file-name'. A typical usage for this if when +copying images from a digital camera into the image directory. -Typically I open up the folder where I store my incoming digital -images, with file names like dscn0319.jpg, dscn0320.jpg etc., mark the -files I want to copy into my main image directory, and execute this + Typically, you would open up the folder with the incoming +digital images, mark the files to be copied, and execute this function. The result is a couple of new files in -`tumme-main-image-directory' called 2005_05_08_12_52_00_dscn0319.jpg, -2005_05_08_14_27_45_dscn0320.jpg etc. - -When the images are safely in my main image directory I start to -browse and tag them using rest of the functionality in `tumme'." +`tumme-main-image-directory' called +2005_05_08_12_52_00_dscn0319.jpg, +2005_05_08_14_27_45_dscn0320.jpg etc." (interactive) (let (new-name (files (dired-get-marked-files))) @@ -2605,7 +2601,7 @@ when using per-directory thumbnail file storage")) ;; Make sure gallery root exist (if (file-exists-p tumme-gallery-dir) (if (not (file-directory-p tumme-gallery-dir)) - (error "tumme-gallery-dir is not a directory")) + (error "Variable tumme-gallery-dir is not a directory")) (make-directory tumme-gallery-dir)) ;; Open index file (setq index-buf (find-file From a7f96a358b12d90b44fa11ac65caf24fd164ad6d Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 10 Feb 2006 00:00:31 +0000 Subject: [PATCH 33/58] * data.c (Findirect_function): Add NOERROR arg. All callers changed to pass Qnil for NOERROR. * keymap.c (current_minor_maps_error): Remove. (current_minor_maps): Pass Qt for NOERROR to Findirect_function instead of using internal_condition_case_1+current_minor_maps_error. --- src/ChangeLog | 9 +++++++++ src/data.c | 11 +++++++---- src/doc.c | 2 +- src/eval.c | 10 +++++----- src/keyboard.c | 2 +- src/keymap.c | 21 ++++++--------------- src/lisp.h | 2 +- 7 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b7124f33d83..fd2c46ec62a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2006-02-10 Kim F. Storm + + * data.c (Findirect_function): Add NOERROR arg. All callers changed + to pass Qnil for NOERROR. + + * keymap.c (current_minor_maps_error): Remove. + (current_minor_maps): Pass Qt for NOERROR to Findirect_function + instead of using internal_condition_case_1+current_minor_maps_error. + 2006-02-09 Jan Dj,Ad(Brv * xterm.c (handle_one_xevent): Must note mouse movement even for nil diff --git a/src/data.c b/src/data.c index 278105ba99b..7919021d061 100644 --- a/src/data.c +++ b/src/data.c @@ -1927,15 +1927,16 @@ indirect_function (object) return hare; } -DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 1, 0, +DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0, doc: /* Return the function at the end of OBJECT's function chain. If OBJECT is a symbol, follow all function indirections and return the final function binding. If OBJECT is not a symbol, just return it. -Signal a void-function error if the final symbol is unbound. +If optional arg NOERROR is nil, signal a void-function error if +the final symbol is unbound. Otherwise, just return nil is unbound. Signal a cyclic-function-indirection error if there is a loop in the function chain of symbols. */) - (object) +(object, noerror) register Lisp_Object object; { Lisp_Object result; @@ -1943,7 +1944,9 @@ function chain of symbols. */) result = indirect_function (object); if (EQ (result, Qunbound)) - return Fsignal (Qvoid_function, Fcons (object, Qnil)); + return (NILP (noerror) + ? Fsignal (Qvoid_function, Fcons (object, Qnil)) + : Qnil); return result; } diff --git a/src/doc.c b/src/doc.c index 5c4c8b45412..0e1042b95a5 100644 --- a/src/doc.c +++ b/src/doc.c @@ -386,7 +386,7 @@ string is passed through `substitute-command-keys'. */) !NILP (tem))) return Fdocumentation_property (function, Qfunction_documentation, raw); - fun = Findirect_function (function); + fun = Findirect_function (function, Qnil); if (SUBRP (fun)) { if (XSUBR (fun)->doc == 0) diff --git a/src/eval.c b/src/eval.c index 2f89e515f8d..eff284820f0 100644 --- a/src/eval.c +++ b/src/eval.c @@ -618,7 +618,7 @@ interactive_p (exclude_subrs_p) /* If this isn't a byte-compiled function, there may be a frame at the top for Finteractive_p. If so, skip it. */ - fun = Findirect_function (*btp->function); + fun = Findirect_function (*btp->function, Qnil); if (SUBRP (fun) && (XSUBR (fun) == &Sinteractive_p || XSUBR (fun) == &Scalled_interactively_p)) btp = btp->next; @@ -639,7 +639,7 @@ interactive_p (exclude_subrs_p) a special form, ignoring frames for Finteractive_p and/or Fbytecode at the top. If this frame is for a built-in function (such as load or eval-region) return nil. */ - fun = Findirect_function (*btp->function); + fun = Findirect_function (*btp->function, Qnil); if (exclude_subrs_p && SUBRP (fun)) return 0; @@ -2079,7 +2079,7 @@ do_autoload (fundef, funname) Vautoload_queue = Qt; unbind_to (count, Qnil); - fun = Findirect_function (fun); + fun = Findirect_function (fun, Qnil); if (!NILP (Fequal (fun, fundef))) error ("Autoloading failed to define function %s", @@ -2142,7 +2142,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0, /* At this point, only original_fun and original_args have values that will be used below */ retry: - fun = Findirect_function (original_fun); + fun = Findirect_function (original_fun, Qnil); if (SUBRP (fun)) { @@ -2841,7 +2841,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS) */) fun = args[0]; - fun = Findirect_function (fun); + fun = Findirect_function (fun, Qnil); if (SUBRP (fun)) { diff --git a/src/keyboard.c b/src/keyboard.c index 21bd13060c4..d5c5f184cfa 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -9700,7 +9700,7 @@ a special event, so ignore the prefix argument and don't clear it. */) while (1) { - final = Findirect_function (cmd); + final = Findirect_function (cmd, Qnil); if (CONSP (final) && (tem = Fcar (final), EQ (tem, Qautoload))) { diff --git a/src/keymap.c b/src/keymap.c index 94cc8920f07..03b36d525b6 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -68,7 +68,7 @@ Lisp_Object Vminibuffer_local_completion_map; /* keymap used for minibuffers when doing completion in filenames */ Lisp_Object Vminibuffer_local_filename_completion_map; -/* keymap used for minibuffers when doing completion in filenames +/* keymap used for minibuffers when doing completion in filenames with require-match*/ Lisp_Object Vminibuffer_local_must_match_filename_map; @@ -1370,13 +1370,6 @@ silly_event_symbol_error (c) static Lisp_Object *cmm_modes = NULL, *cmm_maps = NULL; static int cmm_size = 0; -/* Error handler used in current_minor_maps. */ -static Lisp_Object -current_minor_maps_error () -{ - return Qnil; -} - /* Store a pointer to an array of the keymaps of the currently active minor modes in *buf, and return the number of maps it contains. @@ -1478,9 +1471,7 @@ current_minor_maps (modeptr, mapptr) } /* Get the keymap definition--or nil if it is not defined. */ - temp = internal_condition_case_1 (Findirect_function, - XCDR (assoc), - Qerror, current_minor_maps_error); + temp = Findirect_function (XCDR (assoc), Qt); if (!NILP (temp)) { cmm_modes[i] = var; @@ -3882,11 +3873,11 @@ don't alter it yourself. */); Vminibuffer_local_completion_map = Fmake_sparse_keymap (Qnil); Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map); - DEFVAR_LISP ("minibuffer-local-filename-completion-map", + DEFVAR_LISP ("minibuffer-local-filename-completion-map", &Vminibuffer_local_filename_completion_map, doc: /* Local keymap for minibuffer input with completion for filenames. */); Vminibuffer_local_filename_completion_map = Fmake_sparse_keymap (Qnil); - Fset_keymap_parent (Vminibuffer_local_filename_completion_map, + Fset_keymap_parent (Vminibuffer_local_filename_completion_map, Vminibuffer_local_completion_map); @@ -3896,11 +3887,11 @@ don't alter it yourself. */); Fset_keymap_parent (Vminibuffer_local_must_match_map, Vminibuffer_local_completion_map); - DEFVAR_LISP ("minibuffer-local-must-match-filename-map", + DEFVAR_LISP ("minibuffer-local-must-match-filename-map", &Vminibuffer_local_must_match_filename_map, doc: /* Local keymap for minibuffer input with completion for filenames with exact match. */); Vminibuffer_local_must_match_filename_map = Fmake_sparse_keymap (Qnil); - Fset_keymap_parent (Vminibuffer_local_must_match_filename_map, + Fset_keymap_parent (Vminibuffer_local_must_match_filename_map, Vminibuffer_local_must_match_map); DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist, diff --git a/src/lisp.h b/src/lisp.h index 09f6f38c030..992c05251b8 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2179,7 +2179,7 @@ EXFUN (Fsymbol_function, 1); EXFUN (Fsymbol_plist, 1); EXFUN (Fsymbol_name, 1); extern Lisp_Object indirect_function P_ ((Lisp_Object)); -EXFUN (Findirect_function, 1); +EXFUN (Findirect_function, 2); EXFUN (Ffset, 2); EXFUN (Fsetplist, 2); EXFUN (Fsymbol_value, 1); From cf25c6476761b8ec118957f773c2050560803c07 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 10 Feb 2006 00:02:47 +0000 Subject: [PATCH 34/58] (substitute-key-definition-key): Pass t for NOERROR to indirect-function instead of using condition-case. --- lisp/subr.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/subr.el b/lisp/subr.el index 4a0db9633bd..5abecd35310 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -607,8 +607,7 @@ For most uses, it is simpler and safer to use command remappping like this: (nconc (nreverse skipped) newdef))) ;; Look past a symbol that names a keymap. (setq inner-def - (and defn - (condition-case nil (indirect-function defn) (error defn)))) + (or (indirect-function defn t) defn)) ;; For nested keymaps, we use `inner-def' rather than `defn' so as to ;; avoid autoloading a keymap. This is mostly done to preserve the ;; original non-autoloading behavior of pre-map-keymap times. From d342156ca93374fe446f19a3398badd5afd9c249 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 10 Feb 2006 00:08:08 +0000 Subject: [PATCH 35/58] *** empty log message *** --- lisp/ChangeLog | 5 +++++ lispref/ChangeLog | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ee349bbf06..ab62c15d473 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 Kim F. Storm + + * subr.el (substitute-key-definition-key): Pass t for NOERROR to + indirect-function instead of using condition-case. + 2006-02-10 Mathias Dahl * tumme.el (tumme-copy-with-exif-file-name): Tried to make diff --git a/lispref/ChangeLog b/lispref/ChangeLog index d27c36112ac..b396e8b3ee7 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,7 @@ +2006-02-10 Kim F. Storm + + * eval.texi (Function Indirection): Add NOERROR to indirect-function. + 2006-02-08 Juanma Barranquero * modes.texi (%-Constructs): Remove obsolete info about From ca56fb8c672ee9745166cbf36c84c2d58acd028f Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 10 Feb 2006 00:09:18 +0000 Subject: [PATCH 36/58] (Function Indirection): Add NOERROR to indirect-function. --- lispref/eval.texi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lispref/eval.texi b/lispref/eval.texi index d898e08850b..803f3d4a70d 100644 --- a/lispref/eval.texi +++ b/lispref/eval.texi @@ -314,16 +314,20 @@ symbol function indirection when calling @code{erste}. perform symbol function indirection explicitly. @c Emacs 19 feature -@defun indirect-function function +@defun indirect-function function &optional noerror @anchor{Definition of indirect-function} This function returns the meaning of @var{function} as a function. If @var{function} is a symbol, then it finds @var{function}'s function definition and starts over with that value. If @var{function} is not a symbol, then it returns @var{function} itself. -This function signals a @code{void-function} error if the final -symbol is unbound and a @code{cyclic-function-indirection} error if -there is a loop in the chain of symbols. +This function signals a @code{void-function} error if the final symbol +is unbound and optional argument @var{noerror} is @code{nil} or +omitted. Otherwise, if @var{noerror} is non-@code{nil}, it returns +@code{nil} if the final symbol is unbound. + +It signals a @code{cyclic-function-indirection} error if there is a +loop in the chain of symbols. Here is how you could define @code{indirect-function} in Lisp: From 3412804220a4479e11c6c124299a036e602d7e3b Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 10 Feb 2006 05:08:29 +0000 Subject: [PATCH 37/58] Revision: emacs@sv.gnu.org/emacs--devo--0--patch-62 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 22-26) - Update from CVS - Merge from emacs--devo--0 --- lisp/gnus/ChangeLog | 34 +++++++++++++++ lisp/gnus/mm-view.el | 3 +- lisp/gnus/mml1991.el | 6 ++- lisp/gnus/mml2015.el | 2 + lisp/gnus/nnfolder.el | 2 +- lisp/gnus/rfc2231.el | 98 +++++++++++++++++++++++-------------------- lisp/pgg-def.el | 3 ++ lisp/pgg-gpg.el | 26 ++++++------ man/ChangeLog | 4 ++ man/gnus.texi | 13 +++--- 10 files changed, 124 insertions(+), 67 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 168280e8e24..f7c9732565c 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,37 @@ +2006-02-09 Daiki Ueno + + * pgg-gpg.el (pgg-gpg-encrypt-region): Don't convert line-endings + in elisp. + (pgg-gpg-encrypt-symmetric-region): Ditto. + (pgg-gpg-sign-region): Ditto. + + * pgg-def.el (pgg-text-mode): New variable. + + * mml2015.el (mml2015-pgg-sign): Enable pgg-text-mode. + (mml2015-pgg-encrypt): Ditto. + + * mml1991.el (mml1991-pgg-sign): Enable pgg-text-mode. + (mml1991-pgg-encrypt): Ditto. + +2006-02-08 Katsumi Yamaoka + + * nnfolder.el (nnfolder-insert-newsgroup-line): Use + message-make-date instead of current-time-string. + + * mm-view.el (mm-inline-message): Don't set gnus-newsgroup-charset + to gnus-decoded which mm-uu might set. + +2006-02-08 Katsumi Yamaoka + + * rfc2231.el (rfc2231-parse-string): Sort segmented parameters; + don't decode quoted parameters; remove misimported Emacs code. + Suggested by ARISAWA Akihiro . + (rfc2231-decode-encoded-string): Don't use split-string which + behaves differently according to Emacs version; use + mm-decode-coding-region to convert charset to coding-system. + Suggested by ARISAWA Akihiro . + (rfc2231-encode-string): Remove misimported Emacs code. + 2006-02-07 Katsumi Yamaoka * gnus-art.el (article-decode-charset): Don't use ignore-errors diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 73cab0a5676..43d6bddf194 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -486,7 +486,8 @@ ;; disable prepare hook gnus-article-prepare-hook (gnus-newsgroup-charset - (or charset gnus-newsgroup-charset))) + (unless (eq charset 'gnus-decoded) ;; mm-uu might set it. + (or charset gnus-newsgroup-charset)))) (let ((gnus-original-article-buffer (mm-handle-buffer handle))) (run-hooks 'gnus-article-decode-hook)) (gnus-article-prepare-display) diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index 761ce4f0af4..0c6bb675388 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el @@ -229,7 +229,8 @@ (defvar pgg-output-buffer)) (defun mml1991-pgg-sign (cont) - (let (headers cte) + (let ((pgg-text-mode t) + headers cte) ;; Don't sign headers. (goto-char (point-min)) (while (not (looking-at "^$")) @@ -261,7 +262,8 @@ t)) (defun mml1991-pgg-encrypt (cont &optional sign) - (let (cte) + (let ((pgg-text-mode t) + cte) ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED (goto-char (point-min)) (while (looking-at "^Content[^ ]+:") diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index cb9e77983d3..80dd5b26597 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -814,6 +814,7 @@ (boundary (mml-compute-boundary cont)) (pgg-default-user-id (or (message-options-get 'mml-sender) pgg-default-user-id)) + (pgg-text-mode t) entry) (unless (pgg-sign-region (point-min) (point-max)) (pop-to-buffer mml2015-result-buffer) @@ -841,6 +842,7 @@ (defun mml2015-pgg-encrypt (cont &optional sign) (let ((pgg-errors-buffer mml2015-result-buffer) + (pgg-text-mode t) (boundary (mml-compute-boundary cont))) (unless (pgg-encrypt-region (point-min) (point-max) (split-string diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el index c7043011fa2..bd9957283f4 100644 --- a/lisp/gnus/nnfolder.el +++ b/lisp/gnus/nnfolder.el @@ -826,7 +826,7 @@ deleted. Point is left where the deleted region was." (insert "\n")) (forward-char -1) (insert (format (concat nnfolder-article-marker "%d %s\n") - (cdr group-art) (current-time-string))))) + (cdr group-art) (message-make-date))))) (defun nnfolder-active-number (group) ;; Find the next article number in GROUP. diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el index 31c9f1ade94..7b4cf2447f4 100644 --- a/lisp/gnus/rfc2231.el +++ b/lisp/gnus/rfc2231.el @@ -52,14 +52,8 @@ function fails in parsing of parameters." (let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token)) (stoken (ietf-drums-token-to-list ietf-drums-tspecials)) (ntoken (ietf-drums-token-to-list "0-9")) - (prev-value "") - display-name mailbox c display-string parameters - attribute value type subtype number encoded - prev-attribute prev-encoded) - ;; Some mailer (e.g. Thunderbird 1.5) doesn't terminate each - ;; line with semicolon when folding a long parameter value. - (while (string-match "\\([^\t\n\r ;]\\)[\t ]*\r?\n[\t ]+" string) - (setq string (replace-match "\\1;\n " nil nil string))) + c type attribute encoded number prev-attribute vals + prev-encoded parameters value) (ietf-drums-init (mail-header-remove-whitespace (mail-header-remove-comments string))) (let ((table (copy-syntax-table ietf-drums-syntax-table))) @@ -97,31 +91,36 @@ function fails in parsing of parameters." (point) (progn (forward-sexp 1) (point)))))) (error "Invalid header: %s" string)) (setq c (char-after)) - (when (eq c ?*) - (forward-char 1) - (setq c (char-after)) - (if (not (memq c ntoken)) - (setq encoded t - number nil) - (setq number - (string-to-number - (buffer-substring - (point) (progn (forward-sexp 1) (point))))) - (setq c (char-after)) - (when (eq c ?*) - (setq encoded t) + (if (eq c ?*) + (progn (forward-char 1) - (setq c (char-after))))) + (setq c (char-after)) + (if (not (memq c ntoken)) + (setq encoded t + number nil) + (setq number + (string-to-number + (buffer-substring + (point) (progn (forward-sexp 1) (point))))) + (setq c (char-after)) + (when (eq c ?*) + (setq encoded t) + (forward-char 1) + (setq c (char-after))))) + (setq number nil + encoded nil)) ;; See if we have any previous continuations. (when (and prev-attribute (not (eq prev-attribute attribute))) + (setq vals + (mapconcat 'cdr (sort vals 'car-less-than-car) "")) (push (cons prev-attribute (if prev-encoded - (rfc2231-decode-encoded-string prev-value) - prev-value)) + (rfc2231-decode-encoded-string vals) + vals)) parameters) (setq prev-attribute nil - prev-value "" + vals nil prev-encoded nil)) (unless (eq c ?=) (error "Invalid header: %s" string)) @@ -132,7 +131,10 @@ function fails in parsing of parameters." (setq value (buffer-substring (1+ (point)) (progn (forward-sexp 1) - (1- (point)))))) + (1- (point))))) + (when encoded + (setq value (mapconcat (lambda (c) (format "%%%02x" c)) + value "")))) ((and (or (memq c ttoken) ;; EXTENSION: Support non-ascii chars. (> c ?\177)) @@ -153,9 +155,10 @@ function fails in parsing of parameters." (t (error "Invalid header: %s" string))) (if number - (setq prev-attribute attribute - prev-value (concat prev-value value) - prev-encoded encoded) + (progn + (push (cons number value) vals) + (setq prev-attribute attribute + prev-encoded encoded)) (push (cons attribute (if encoded (rfc2231-decode-encoded-string value) @@ -164,10 +167,11 @@ function fails in parsing of parameters." ;; Take care of any final continuations. (when prev-attribute + (setq vals (mapconcat 'cdr (sort vals 'car-less-than-car) "")) (push (cons prev-attribute (if prev-encoded - (rfc2231-decode-encoded-string prev-value) - prev-value)) + (rfc2231-decode-encoded-string vals) + vals)) parameters))) (error (setq parameters nil) @@ -181,25 +185,27 @@ function fails in parsing of parameters." (defun rfc2231-decode-encoded-string (string) "Decode an RFC2231-encoded string. -These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"." - (with-temp-buffer - (let ((elems (split-string string "'"))) - ;; The encoded string may contain zero to two single-quote - ;; marks. This should give us the encoded word stripped - ;; of any preceding values. - (insert (car (last elems))) +These look like: + \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\", + \"us-ascii''This%20is%20%2A%2A%2Afun%2A%2A%2A\", + \"'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\", + \"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or + \"This is ***fun***\"." + (string-match "\\`\\(\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string) + (let ((coding-system (mm-charset-to-coding-system (match-string 2 string))) + ;;(language (match-string 3 string)) + (value (match-string 4 string))) + (mm-with-multibyte-buffer + (insert value) (goto-char (point-min)) (while (search-forward "%" nil t) (insert (prog1 (string-to-number (buffer-substring (point) (+ (point) 2)) 16) (delete-region (1- (point)) (+ (point) 2))))) - ;; Encode using the charset, if any. - (when (and (mm-multibyte-p) - (> (length elems) 1) - (not (equal (intern (downcase (car elems))) 'us-ascii))) - (mm-decode-coding-region (point-min) (point-max) - (intern (downcase (car elems))))) + ;; Decode using the charset, if any. + (unless (memq coding-system '(nil ascii)) + (mm-decode-coding-region (point-min) (point-max) coding-system)) (buffer-string)))) (defun rfc2231-encode-string (param value) @@ -263,12 +269,12 @@ the result of this function." (forward-line 1)))) (spacep (goto-char (point-min)) - (insert "\n " param "=\"") + (insert param "=\"") (goto-char (point-max)) (insert "\"")) (t (goto-char (point-min)) - (insert "\n " param "="))) + (insert param "="))) (buffer-string)))) (provide 'rfc2231) diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el index 0b356461d6c..058dca4fa8f 100644 --- a/lisp/pgg-def.el +++ b/lisp/pgg-def.el @@ -83,6 +83,9 @@ Whether the passphrase is cached at all is controlled by (defvar pgg-scheme nil "Current scheme of PGP implementation.") +(defvar pgg-text-mode nil + "If t, inform the recipient that the input is text.") + (defmacro pgg-truncate-key-identifier (key) `(if (> (length ,key) 8) (substring ,key 8) ,key)) diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index be9b8bf9e77..0c9f45ab5b9 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el @@ -87,7 +87,9 @@ (buffer-disable-undo) (erase-buffer) (if (file-exists-p output-file-name) - (let ((coding-system-for-read 'raw-text-dos)) + (let ((coding-system-for-read (if pgg-text-mode + 'raw-text + 'binary))) (insert-file-contents output-file-name))) (set-buffer errors-buffer) (if (not (equal exit-status 0)) @@ -187,7 +189,8 @@ passphrase cache or user." pgg-gpg-user-id)))) (args (append - (list "--batch" "--textmode" "--armor" "--always-trust" "--encrypt") + (list "--batch" "--armor" "--always-trust" "--encrypt") + (if pgg-text-mode (list "--textmode")) (if sign (list "--sign" "--local-user" pgg-gpg-user-id)) (if recipients (apply #'nconc @@ -196,8 +199,7 @@ passphrase cache or user." (append recipients (if pgg-encrypt-for-me (list pgg-gpg-user-id))))))))) - (pgg-as-lbt start end 'CRLF - (pgg-gpg-process-region start end passphrase pgg-gpg-program args)) + (pgg-gpg-process-region start end passphrase pgg-gpg-program args) (when sign (with-current-buffer pgg-errors-buffer ;; Possibly cache passphrase under, e.g. "jas", for future sign. @@ -215,9 +217,9 @@ passphrase cache or user." (pgg-read-passphrase "GnuPG passphrase for symmetric encryption: "))) (args - (append (list "--batch" "--textmode" "--armor" "--symmetric" )))) - (pgg-as-lbt start end 'CRLF - (pgg-gpg-process-region start end passphrase pgg-gpg-program args)) + (append (list "--batch" "--armor" "--symmetric" ) + (if pgg-text-mode (list "--textmode"))))) + (pgg-gpg-process-region start end passphrase pgg-gpg-program args) (pgg-process-when-success))) (defun pgg-gpg-decrypt-region (start end &optional passphrase) @@ -279,13 +281,13 @@ passphrase cache or user." (format "GnuPG passphrase for %s: " pgg-gpg-user-id) pgg-gpg-user-id))) (args - (list (if cleartext "--clearsign" "--detach-sign") - "--armor" "--batch" "--verbose" - "--local-user" pgg-gpg-user-id)) + (append (list (if cleartext "--clearsign" "--detach-sign") + "--armor" "--batch" "--verbose" + "--local-user" pgg-gpg-user-id) + (if pgg-text-mode (list "--textmode")))) (inhibit-read-only t) buffer-read-only) - (pgg-as-lbt start end 'CRLF - (pgg-gpg-process-region start end passphrase pgg-gpg-program args)) + (pgg-gpg-process-region start end passphrase pgg-gpg-program args) (with-current-buffer pgg-errors-buffer ;; Possibly cache passphrase under, e.g. "jas", for future sign. (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id) diff --git a/man/ChangeLog b/man/ChangeLog index e5ebb72c2c5..242594b1945 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2006-02-09 Reiner Steib + + * gnus.texi (Gnus Versions): Add history beyond start of Oort. + 2006-02-09 Mathias Dahl * dired.texi (Tumme): Basic documentation for Tumme added. diff --git a/man/gnus.texi b/man/gnus.texi index 8fe7355a4c8..bdfe5ab2194 100644 --- a/man/gnus.texi +++ b/man/gnus.texi @@ -24547,14 +24547,17 @@ Gnus 5.6 begat Pterodactyl Gnus on August 29th 1998 and was released as ``Gnus 5.8'' (after 99 releases and a CVS repository) on December 3rd 1999. -On the 26th of October 2000, Oort Gnus was begun. +On the 26th of October 2000, Oort Gnus was begun and was released as +Gnus 5.10 on May 1st 2003 (24 releases). + +On the January 4th 2004, No Gnus was begun. If you happen upon a version of Gnus that has a prefixed name -- ``(ding) Gnus'', ``September Gnus'', ``Red Gnus'', ``Quassia Gnus'', -``Pterodactyl Gnus'', ``Oort Gnus'' -- don't panic. Don't let it know -that you're frightened. Back away. Slowly. Whatever you do, don't -run. Walk away, calmly, until you're out of its reach. Find a proper -released version of Gnus and snuggle up to that instead. +``Pterodactyl Gnus'', ``Oort Gnus'', ``No Gnus'' -- don't panic. +Don't let it know that you're frightened. Back away. Slowly. Whatever +you do, don't run. Walk away, calmly, until you're out of its reach. +Find a proper released version of Gnus and snuggle up to that instead. @node Other Gnus Versions From 02501160b4d9f8c793e2efe7fd90ce17352c3399 Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Fri, 10 Feb 2006 07:20:11 +0000 Subject: [PATCH 38/58] *** empty log message *** --- lisp/ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab62c15d473..c5810d25d59 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -6,13 +6,13 @@ 2006-02-10 Mathias Dahl * tumme.el (tumme-copy-with-exif-file-name): Tried to make - docstring less `colloquial'... + docstring less `colloquial'... 2006-02-09 Mathias Dahl * tumme.el: Added a couple of todo items. -2006-02-09 Lars Hansen +2006-02-09 Lars Hansen * hilit-chg.el: Add highlight-changes-mode to desktop-locals-to-save. @@ -23,7 +23,7 @@ * image-mode.el (image-toggle-display): Clear image cache if using filename. -2006-02-09 Masatake YAMATO +2006-02-09 Masatake YAMATO * dired-x.el (dired-guess-shell-alist-default): Add .man as a `dired-man' target. From dbc4287b14e5bcd00f623b2b2eea36b781a37e27 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Fri, 10 Feb 2006 07:54:12 +0000 Subject: [PATCH 39/58] Update copyright for 2006. --- lisp/progmodes/ada-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 6442463796c..d7e1ecb67e1 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -1,7 +1,7 @@ ;;; ada-mode.el --- major-mode for editing Ada sources ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rolf Ebert ;; Markus Heritsch From 3c5876d2688c5df8ec16047da75dac9ab7145338 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 10 Feb 2006 08:19:36 +0000 Subject: [PATCH 40/58] (select-frame-set-input-focus): Call x-focus-frame also when window-system is mac. --- lisp/frame.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/frame.el b/lisp/frame.el index 5e6451dccac..8437475dfd6 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -695,7 +695,7 @@ automatically." (select-frame frame) (raise-frame frame) ;; Ensure, if possible, that frame gets input focus. - (cond ((eq window-system 'x) + (cond ((memq window-system '(x mac)) (x-focus-frame frame)) ((eq window-system 'w32) (w32-focus-frame frame))) From 2f8efa69e0260bbd41c36f7365bd7beec6d9c51f Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 10 Feb 2006 08:19:53 +0000 Subject: [PATCH 41/58] (fontset-standard): Rename from "fontset-mac". --- lisp/term/mac-win.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 2c6bcd67d37..4ccb017682c 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1918,9 +1918,9 @@ It returns a name of the created fontset." ;; characters decoded from mac-roman encoding (ascii, latin-iso8859-1, ;; and mule-unicode-xxxx-yyyy) are displayed by a mac-roman font. (create-fontset-from-fontset-spec - "-etl-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-mac, + "-etl-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-standard, ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman") -(fontset-add-mac-fonts "fontset-mac" t) +(fontset-add-mac-fonts "fontset-standard" t) ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...). (create-fontset-from-x-resource) From 809996951e6f2bfc184a4188fdf393022fd739d8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 10 Feb 2006 08:20:35 +0000 Subject: [PATCH 42/58] (shortlisp, SOME_MACHINE_LISP): Sync with src/Makefile.in. --- mac/makefile.MPW | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mac/makefile.MPW b/mac/makefile.MPW index 35818f5e91b..4d0986ea60f 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW @@ -1024,6 +1024,7 @@ shortlisp = {Lisp}help.elc ¶ {Lisp}indent.elc ¶ {Lisp}isearch.elc ¶ + {Lisp}rfn-eshadow.elc ¶ {Lisp}loadup.el ¶ {Lisp}loaddefs.el ¶ {Lisp}bindings.elc ¶ @@ -1098,9 +1099,13 @@ SOME_MACHINE_LISP = {Lisp}mouse.elc {Lisp}ls-lisp.elc {Lisp}dos-fns.elc ¶ {Lisp}w32-fns.elc {Lisp}dos-w32.elc ¶ {Lisp}disp-table.elc {Lisp}dos-vars.elc ¶ - {Lisp}tooltip.elc ¶ + {Lisp}tooltip.elc {Lisp}image.elc ¶ + {Lisp}dnd.elc {Lisp}mwheel.elc ¶ + {Lisp}tool-bar.elc ¶ + {Lisp}x-dnd.elc ¶ {Lisp}international:ccl.elc ¶ - {Lisp}international:codepage.elc + {Lisp}international:codepage.elc ¶ + {Lisp}international:fontset.elc Doc Ä {DocTarget}DOC From 81f4f723c86e0647ba4e7fc77d2aa39c2333320e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 10 Feb 2006 08:21:07 +0000 Subject: [PATCH 43/58] (Mac International): Rename "fontset-mac" to "fontset-standard". --- man/macos.texi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/man/macos.texi b/man/macos.texi index 76a11ea92e7..ba0f9e995ca 100644 --- a/man/macos.texi +++ b/man/macos.texi @@ -104,12 +104,12 @@ character codes in the range 128-159. The coding systems @code{mac-roman}, @code{mac-centraleurroman}, and @code{mac-cyrillic} are used to represent these Mac encodings. - The fontset @code{fontset-mac} is created automatically when Emacs -is run on Mac, and used by default. It displays as many kinds of -characters as possible using 12-point Monaco as a base font. If you -see some character as a hollow box with this fontset, then it's almost -impossible to display it only by customizing font settings (@pxref{Mac -Font Specs}). + The fontset @code{fontset-standard} is created automatically when +Emacs is run on Mac, and used by default. It displays as many kinds +of characters as possible using 12-point Monaco as a base font. If +you see some character as a hollow box with this fontset, then it's +almost impossible to display it only by customizing font settings +(@pxref{Mac Font Specs}). You can use input methods provided either by LEIM (@pxref{Input Methods}) or Mac OS to enter international characters. To use the From 7d53d6786c13720fd51ebd17507b218915371ef0 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 10 Feb 2006 08:21:47 +0000 Subject: [PATCH 44/58] (x_set_mouse_color): Don't call rif->define_frame_cursor if window_desc is not set yet. (Fx_create_frame): Remove variable x_frame_name. Apply 2005-12-07 and 2006-01-26 changes for xfns.c. Call x_iconify_frame if frame parameter `visibility' is `icon'. (Fx_create_frame, x_create_tip_frame): Use "fontset-standard" instead of "fontset-mac". (Fx_focus_frame): New defun. (syms_of_macfns): Defsubr it. --- src/macfns.c | 77 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 20 deletions(-) diff --git a/src/macfns.c b/src/macfns.c index 472d8d612b5..b6ef85bcd9f 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -1448,7 +1448,8 @@ x_set_mouse_color (f, arg, oldval) BLOCK_INPUT; - rif->define_frame_cursor (f, cursor); + if (FRAME_MAC_WINDOW (f) != 0) + rif->define_frame_cursor (f, cursor); f->output_data.mac->text_cursor = cursor; f->output_data.mac->nontext_cursor = nontext_cursor; @@ -2398,11 +2399,12 @@ This function is an internal primitive--use `make-frame' instead. */) struct mac_display_info *dpyinfo = NULL; Lisp_Object parent; struct kboard *kb; - char x_frame_name[10]; static int x_frame_count = 2; /* begins at 2 because terminal frame is F1 */ check_mac (); + parms = Fcopy_alist (parms); + /* Use this general default value to start with until we know if this frame has a specified name. */ Vx_resource_name = Vinvocation_name; @@ -2452,18 +2454,6 @@ This function is an internal primitive--use `make-frame' instead. */) else f = make_frame (1); - if (EQ (name, Qunbound) || NILP (name)) - { - sprintf (x_frame_name, "F%d", x_frame_count++); - f->name = build_string (x_frame_name); - f->explicit_name = 0; - } - else - { - f->name = name; - f->explicit_name = 1; - } - XSETFRAME (frame, f); /* Note that X Windows does support scroll bars. */ @@ -2544,7 +2534,7 @@ This function is an internal primitive--use `make-frame' instead. */) font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); /* If those didn't work, look for something which will at least work. */ if (! STRINGP (font)) - font = x_new_fontset (f, "fontset-mac"); + font = x_new_fontset (f, "fontset-standard"); if (! STRINGP (font)) font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); if (! STRINGP (font)) @@ -2679,17 +2669,28 @@ This function is an internal primitive--use `make-frame' instead. */) if (EQ (visibility, Qunbound)) visibility = Qt; -#if 0 /* MAC_TODO: really no iconify on Mac */ if (EQ (visibility, Qicon)) x_iconify_frame (f); - else -#endif - if (! NILP (visibility)) + else if (! NILP (visibility)) x_make_frame_visible (f); else /* Must have been Qnil. */ ; } + + /* Initialize `default-minibuffer-frame' in case this is the first + frame on this display device. */ + if (FRAME_HAS_MINIBUF_P (f) + && (!FRAMEP (kb->Vdefault_minibuffer_frame) + || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame)))) + kb->Vdefault_minibuffer_frame = frame; + + /* All remaining specified parameters, which have not been "used" + by x_get_arg and friends, now go in the misc. alist of the frame. */ + for (tem = parms; !NILP (tem); tem = XCDR (tem)) + if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) + f->param_alist = Fcons (XCAR (tem), f->param_alist); + UNGCPRO; /* Make sure windows on this frame appear in calls to next-window @@ -2699,9 +2700,11 @@ This function is an internal primitive--use `make-frame' instead. */) return unbind_to (count, frame); } + /* FRAME is used only to get a handle on the X display. We don't pass the display info directly because we're called from frame.c, which doesn't know about that structure. */ + Lisp_Object x_get_focus_frame (frame) struct frame *frame; @@ -2714,6 +2717,39 @@ x_get_focus_frame (frame) XSETFRAME (xfocus, dpyinfo->x_focus_frame); return xfocus; } + + +DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0, + doc: /* Set the input focus to FRAME. +FRAME nil means use the selected frame. */) + (frame) + Lisp_Object frame; +{ + struct frame *f = check_x_frame (frame); + struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f); + + if (dpyinfo->x_focus_frame != f) + { + BLOCK_INPUT; +#ifdef MAC_OSX + ActivateWindow (ActiveNonFloatingWindow (), false); + ActivateWindow (FRAME_MAC_WINDOW (f), true); +#else +#if !TARGET_API_MAC_CARBON + /* SelectWindow (Non-Carbon) does not issue deactivate events if + the possibly inactive window that is to be selected is + already the frontmost one. */ + SendBehind (FRAME_MAC_WINDOW (f), NULL); +#endif + /* This brings the window to the front. */ + SelectWindow (FRAME_MAC_WINDOW (f)); +#endif + UNBLOCK_INPUT; + } + + return Qnil; +} + DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, doc: /* Internal function called by `color-defined-p', which see. */) @@ -3664,7 +3700,7 @@ x_create_tip_frame (dpyinfo, parms, text) font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); /* If those didn't work, look for something which will at least work. */ if (! STRINGP (font)) - font = x_new_fontset (f, "fontset-mac"); + font = x_new_fontset (f, "fontset-standard"); if (! STRINGP (font)) font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); if (! STRINGP (font)) @@ -4513,6 +4549,7 @@ Chinese, Japanese, and Korean. */); defsubr (&Sx_close_connection); defsubr (&Sx_display_list); defsubr (&Sx_synchronize); + defsubr (&Sx_focus_frame); /* Setting callback functions for fontset handler. */ get_font_info_func = x_get_font_info; From b465419fdfd093b1d59fdea95d990a8775f34b98 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 10 Feb 2006 08:22:12 +0000 Subject: [PATCH 45/58] (mac_define_frame_cursor): Don't change pointer shape for unfocused frame. (x_raise_frame): Call BringToFront instead of SelectWindow. (x_lower_frame): Use NULL instead of nil. (x_make_frame_visible): Don't call SelectWindow. (XTread_socket): Increment handling_signal at the start, decrement it at the end. [USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): Use CFPreferencesGetAppIntegerValue instead of Fmac_get_preference. --- src/macterm.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/macterm.c b/src/macterm.c index 9051196f2fc..69181958cf0 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -1026,12 +1026,15 @@ static int cg_text_anti_aliasing_threshold = 8; static void init_cg_text_anti_aliasing_threshold () { - Lisp_Object val = - Fmac_get_preference (build_string ("AppleAntiAliasingThreshold"), - Qnil, Qnil, Qnil); + int threshold; + Boolean valid_p; - if (INTEGERP (val)) - cg_text_anti_aliasing_threshold = XINT (val); + threshold = + CFPreferencesGetAppIntegerValue (CFSTR ("AppleAntiAliasingThreshold"), + kCFPreferencesCurrentApplication, + &valid_p); + if (valid_p) + cg_text_anti_aliasing_threshold = threshold; } static int @@ -5299,7 +5302,10 @@ mac_define_frame_cursor (f, cursor) struct frame *f; Cursor cursor; { - SetThemeCursor (cursor); + struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f); + + if (dpyinfo->x_focus_frame == f) + SetThemeCursor (cursor); } @@ -5837,7 +5843,7 @@ x_raise_frame (f) if (f->async_visible) { BLOCK_INPUT; - SelectWindow (FRAME_MAC_WINDOW (f)); + BringToFront (FRAME_MAC_WINDOW (f)); UNBLOCK_INPUT; } } @@ -5851,7 +5857,7 @@ x_lower_frame (f) if (f->async_visible) { BLOCK_INPUT; - SendBehind (FRAME_MAC_WINDOW (f), nil); + SendBehind (FRAME_MAC_WINDOW (f), NULL); UNBLOCK_INPUT; } } @@ -5964,7 +5970,6 @@ x_make_frame_visible (f) f->output_data.mac->asked_for_visible = 1; - SelectWindow (FRAME_MAC_WINDOW (f)); CollapseWindow (FRAME_MAC_WINDOW (f), false); ShowWindow (FRAME_MAC_WINDOW (f)); } @@ -9581,6 +9586,8 @@ XTread_socket (sd, expected, hold_quit) /* So people can tell when we have read the available input. */ input_signal_count++; + ++handling_signal; + #if USE_CARBON_EVENTS toolbox_dispatcher = GetEventDispatcherTarget (); @@ -10221,6 +10228,7 @@ XTread_socket (sd, expected, hold_quit) } #endif + --handling_signal; UNBLOCK_INPUT; return count; } From e9452469cf643740df26b6c215a85373859e933a Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 10 Feb 2006 08:35:25 +0000 Subject: [PATCH 46/58] (Mac OS X): Add QuickTime 7.0.4 / Mac OS X 10.3.9 breakage. --- etc/PROBLEMS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 587d9090436..490c59aa922 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1774,6 +1774,13 @@ There appears to be a problem with the implementation of pty's on the Mac OS X that causes process output to be truncated. To avoid this, leave process-connection-type set to its default value of nil. +*** Mac OS X 10.3.9 (Carbon): QuickTime 7.0.4 updater breaks build. + +On the above environment, build fails at the link stage with the +message like "Undefined symbols: _HICopyAccessibilityActionDescription +referenced from QuickTime expected to be defined in Carbon". A +workaround is to use QuickTime 7.0.1 reinstaller. + ** FreeBSD *** FreeBSD 2.1.5: useless symbolic links remain in /tmp or other From cbd488c46a4a79f2879d1bfefdd70e33f19cdc56 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 10 Feb 2006 08:35:43 +0000 Subject: [PATCH 47/58] *** empty log message *** --- etc/ChangeLog | 4 ++++ lisp/ChangeLog | 7 +++++++ mac/ChangeLog | 5 +++++ man/ChangeLog | 5 +++++ src/ChangeLog | 22 ++++++++++++++++++++++ 5 files changed, 43 insertions(+) diff --git a/etc/ChangeLog b/etc/ChangeLog index 70295a93eeb..382a97ab50a 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2006-02-10 YAMAMOTO Mitsuharu + + * PROBLEMS (Mac OS X): Add QuickTime 7.0.4 / Mac OS X 10.3.9 breakage. + 2006-02-09 Mathias Dahl * NEWS: New key bindings for Tumme in Dired. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c5810d25d59..226aba7a7ea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2006-02-10 YAMAMOTO Mitsuharu + + * frame.el (select-frame-set-input-focus): Call x-focus-frame also + when window-system is mac. + + * term/mac-win.el (fontset-standard): Rename from "fontset-mac". + 2006-02-10 Kim F. Storm * subr.el (substitute-key-definition-key): Pass t for NOERROR to diff --git a/mac/ChangeLog b/mac/ChangeLog index eb58386a167..5da9f7aca76 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 YAMAMOTO Mitsuharu + + * makefile.MPW (shortlisp, SOME_MACHINE_LISP): Sync with + src/Makefile.in. + 2005-12-19 YAMAMOTO Mitsuharu * makefile.MPW (macselect.c.x): Depend on keymap.h. diff --git a/man/ChangeLog b/man/ChangeLog index 242594b1945..e48374ce6d4 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 YAMAMOTO Mitsuharu + + * macos.texi (Mac International): Rename "fontset-mac" to + "fontset-standard". + 2006-02-09 Reiner Steib * gnus.texi (Gnus Versions): Add history beyond start of Oort. diff --git a/src/ChangeLog b/src/ChangeLog index fd2c46ec62a..d5a57e890ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,25 @@ +2006-02-10 YAMAMOTO Mitsuharu + + * macfns.c (x_set_mouse_color): Don't call rif->define_frame_cursor + if window_desc is not set yet. + (Fx_create_frame): Remove variable x_frame_name. Apply 2005-12-07 + and 2006-01-26 changes for xfns.c. Call x_iconify_frame if frame + parameter `visibility' is `icon'. + (Fx_create_frame, x_create_tip_frame): Use "fontset-standard" + instead of "fontset-mac". + (Fx_focus_frame): New defun. + (syms_of_macfns): Defsubr it. + + * macterm.c (mac_define_frame_cursor): Don't change pointer shape + for unfocused frame. + (x_raise_frame): Call BringToFront instead of SelectWindow. + (x_lower_frame): Use NULL instead of nil. + (x_make_frame_visible): Don't call SelectWindow. + (XTread_socket): Increment handling_signal at the start, decrement + it at the end. + [USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): Use + CFPreferencesGetAppIntegerValue instead of Fmac_get_preference. + 2006-02-10 Kim F. Storm * data.c (Findirect_function): Add NOERROR arg. All callers changed From d91362c9e06c30bb8684519f8b9eb1498f0fd614 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Fri, 10 Feb 2006 09:00:31 +0000 Subject: [PATCH 48/58] Update copyright for 2006. --- lisp/progmodes/ada-prj.el | 2 +- lisp/progmodes/ada-stmt.el | 2 +- lisp/progmodes/ada-xref.el | 2 +- lisp/progmodes/antlr-mode.el | 2 +- lisp/progmodes/asm-mode.el | 2 +- lisp/progmodes/autoconf.el | 2 +- lisp/progmodes/cc-align.el | 3 ++- lisp/progmodes/cc-awk.el | 4 +-- lisp/progmodes/cc-bytecomp.el | 4 +-- lisp/progmodes/cc-cmds.el | 4 +-- lisp/progmodes/cc-compat.el | 4 +-- lisp/progmodes/cc-defs.el | 4 +-- lisp/progmodes/cc-engine.el | 4 +-- lisp/progmodes/cc-fonts.el | 2 +- lisp/progmodes/cc-langs.el | 13 +++++---- lisp/progmodes/cc-menus.el | 4 +-- lisp/progmodes/cc-mode.el | 4 +-- lisp/progmodes/cc-styles.el | 4 +-- lisp/progmodes/cc-subword.el | 2 +- lisp/progmodes/cc-vars.el | 4 +-- lisp/progmodes/cfengine.el | 3 ++- lisp/progmodes/cmacexp.el | 2 +- lisp/progmodes/compile.el | 2 +- lisp/progmodes/cperl-mode.el | 2 +- lisp/progmodes/cpp.el | 2 +- lisp/progmodes/cwarn.el | 2 +- lisp/progmodes/dcl-mode.el | 2 +- lisp/progmodes/delphi.el | 2 +- lisp/progmodes/ebnf-abn.el | 3 ++- lisp/progmodes/ebnf-bnf.el | 2 +- lisp/progmodes/ebnf-dtd.el | 3 ++- lisp/progmodes/ebnf-ebx.el | 3 ++- lisp/progmodes/ebnf-iso.el | 2 +- lisp/progmodes/ebnf-otz.el | 2 +- lisp/progmodes/ebnf-yac.el | 2 +- lisp/progmodes/ebnf2ps.el | 2 +- lisp/progmodes/ebrowse.el | 2 +- lisp/progmodes/etags.el | 2 +- lisp/progmodes/executable.el | 2 +- lisp/progmodes/gdb-ui.el | 32 ++++++++++++++++++++++- lisp/progmodes/glasses.el | 2 +- lisp/progmodes/grep.el | 2 +- lisp/progmodes/gud.el | 2 +- lisp/progmodes/hideif.el | 2 +- lisp/progmodes/hideshow.el | 2 +- lisp/progmodes/icon.el | 2 +- lisp/progmodes/idlw-complete-structtag.el | 3 ++- lisp/progmodes/idlw-help.el | 2 +- lisp/progmodes/idlw-rinfo.el | 4 +-- lisp/progmodes/idlw-shell.el | 4 +-- lisp/progmodes/idlw-toolbar.el | 4 +-- lisp/progmodes/idlwave.el | 4 +-- lisp/progmodes/inf-lisp.el | 2 +- lisp/progmodes/ld-script.el | 3 ++- lisp/progmodes/m4-mode.el | 2 +- lisp/progmodes/make-mode.el | 2 +- lisp/progmodes/mantemp.el | 2 +- lisp/progmodes/meta-mode.el | 2 +- lisp/progmodes/mixal-mode.el | 2 +- lisp/progmodes/octave-hlp.el | 2 +- lisp/progmodes/octave-inf.el | 2 +- lisp/progmodes/octave-mod.el | 2 +- lisp/progmodes/pascal.el | 2 +- lisp/progmodes/perl-mode.el | 2 +- lisp/progmodes/prolog.el | 2 +- lisp/progmodes/ps-mode.el | 2 +- lisp/progmodes/python.el | 2 +- lisp/progmodes/scheme.el | 4 +-- lisp/progmodes/sh-script.el | 4 +-- lisp/progmodes/simula.el | 2 +- lisp/progmodes/sql.el | 2 +- lisp/progmodes/vhdl-mode.el | 2 +- lisp/progmodes/which-func.el | 2 +- lisp/progmodes/xscheme.el | 2 +- 74 files changed, 134 insertions(+), 94 deletions(-) diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el index 91adf1ed187..1d42a391066 100644 --- a/lisp/progmodes/ada-prj.el +++ b/lisp/progmodes/ada-prj.el @@ -1,6 +1,6 @@ ;;; ada-prj.el --- easy editing of project files for the ada-mode -;; 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: Emmanuel Briot diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el index 87825b1d624..525b53c2146 100644 --- a/lisp/progmodes/ada-stmt.el +++ b/lisp/progmodes/ada-stmt.el @@ -1,7 +1,7 @@ ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates ;; Copyright(C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 241296d8f67..9e3f8e14332 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -1,7 +1,7 @@ ;;; ada-xref.el --- for lookup and completion in Ada mode ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Markus Heritsch ;; Rolf Ebert diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 229bec56dd5..7ddd9212f6c 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -1,6 +1,6 @@ ;;; antlr-mode.el --- major mode for ANTLR grammar files -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; ;; Author: Christoph.Wedler@sap.com diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el index 44605b1fa9a..b79237adba7 100644 --- a/lisp/progmodes/asm-mode.el +++ b/lisp/progmodes/asm-mode.el @@ -1,6 +1,6 @@ ;;; asm-mode.el --- mode for editing assembler code -;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Eric S. Raymond diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index 97cf21d175e..fe021d04cea 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -1,6 +1,6 @@ ;;; autoconf.el --- mode for editing Autoconf configure.in files -;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005 +;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Dave Love diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el index 83b4d8387d4..8420ec99636 100644 --- a/lisp/progmodes/cc-align.el +++ b/lisp/progmodes/cc-align.el @@ -1,6 +1,7 @@ ;;; cc-align.el --- custom indentation functions for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index b16d571d277..9f86638696c 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -1,7 +1,7 @@ ;;; cc-awk.el --- AWK specific code within cc-mode. -;; Copyright (C) 1988,94,96,2000, 2001, 2002, 2003, 2004, 2005 Free -;; Software Foundation, Inc. +;; Copyright (C) 1988,94,96,2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Alan Mackenzie (originally based on awk-mode.el) ;; Maintainer: FSF diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el index 6358f230e7c..f001fa60b25 100644 --- a/lisp/progmodes/cc-bytecomp.el +++ b/lisp/progmodes/cc-bytecomp.el @@ -1,7 +1,7 @@ ;;; cc-bytecomp.el --- compile time setup for proper compilation -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Martin Stjernholm ;; Maintainer: bug-cc-mode@gnu.org diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index e17656e54dd..4c8aa1518b7 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1,7 +1,7 @@ ;;; cc-cmds.el --- user level commands for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el index 66bf9a55d79..0cd7973857c 100644 --- a/lisp/progmodes/cc-compat.el +++ b/lisp/progmodes/cc-compat.el @@ -1,7 +1,7 @@ ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1994-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 9de0a24f09e..0053cfcf443 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -1,7 +1,7 @@ ;;; cc-defs.el --- compile time definitions for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 7f829bd26d5..548fc74d961 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -1,7 +1,7 @@ ;;; cc-engine.el --- core syntax guessing engine for CC mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index e5dcecf459f..75d631ac399 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1,6 +1,6 @@ ;;; cc-fonts.el --- font lock support for CC Mode -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 2002- Martin Stjernholm diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 3c1df93e0f9..bea3b4f7e8c 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -1,7 +1,7 @@ ;;; cc-langs.el --- language specific settings for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw @@ -258,9 +258,12 @@ the evaluated constant value at compile time." (c-fn-region-is-active-p)])) "----" ("Toggle..." - ["Syntactic indentation" c-toggle-syntactic-indentation t] - ["Auto newline" c-toggle-auto-newline t] - ["Hungry delete" c-toggle-hungry-state t]))) + ["Syntactic indentation" c-toggle-syntactic-indentation + :style toggle :selected c-syntactic-indentation] + ["Auto newline" c-toggle-auto-newline + :style toggle :selected c-auto-newline] + ["Hungry delete" c-toggle-hungry-state + :style toggle :selected c-hungry-delete-key]))) ;;; Syntax tables. diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el index e11f50c581b..418823b71fa 100644 --- a/lisp/progmodes/cc-menus.el +++ b/lisp/progmodes/cc-menus.el @@ -1,7 +1,7 @@ ;;; cc-menus.el --- imenu support for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 247a4021abf..3994fe5cf09 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1,7 +1,7 @@ ;;; cc-mode.el --- major mode for editing C and similar languages -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 1998- Martin Stjernholm diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index 2377b4ce8bd..758720a3fd6 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -1,7 +1,7 @@ ;;; cc-styles.el --- support for styles in CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-subword.el b/lisp/progmodes/cc-subword.el index fd4ca891298..6ba76708ebf 100644 --- a/lisp/progmodes/cc-subword.el +++ b/lisp/progmodes/cc-subword.el @@ -1,6 +1,6 @@ ;;; cc-subword.el --- Handling capitalized subwords in a nomenclature -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masatake YAMATO diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 4c5d03c6f4c..9bde0c5dbaf 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1,7 +1,7 @@ ;;; cc-vars.el --- user customization variables for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index a4b0389ab86..1b62774a72d 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el @@ -1,6 +1,7 @@ ;;; cfengine.el --- mode for editing Cfengine files -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Love ;; Keywords: languages diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el index b3051f37b9d..8531a2f3133 100644 --- a/lisp/progmodes/cmacexp.el +++ b/lisp/progmodes/cmacexp.el @@ -1,6 +1,6 @@ ;;; cmacexp.el --- expand C macros in a region -;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Francesco Potorti` diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index da2a3ee9d65..b1f02ed2ebf 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1,7 +1,7 @@ ;;; compile.el --- run compiler as inferior of Emacs, parse error messages ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Authors: Roland McGrath , ;; Daniel Pfeiffer diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index dd1dcad3cc4..36f75b757b5 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1,7 +1,7 @@ ;;; cperl-mode.el --- Perl code editing commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997, -;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Ilya Zakharevich and Bob Olson diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index 06a141016e5..62f74b41a70 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el @@ -1,6 +1,6 @@ ;;; cpp.el --- highlight or hide text according to cpp conditionals -;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation ;; Author: Per Abrahamsen diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el index 979913f10c0..f0933bba8cd 100644 --- a/lisp/progmodes/cwarn.el +++ b/lisp/progmodes/cwarn.el @@ -1,6 +1,6 @@ ;;; cwarn.el --- highlight suspicious C and C++ constructions -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Anders Lindgren diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index 16d1d7ba415..c3bc75c0d79 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -1,6 +1,6 @@ ;;; dcl-mode.el --- major mode for editing DCL command files -;; Copyright (c) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (c) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Odd Gripenstam diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el index 4c271113b72..03ab24adf47 100644 --- a/lisp/progmodes/delphi.el +++ b/lisp/progmodes/delphi.el @@ -1,6 +1,6 @@ ;;; delphi.el --- major mode for editing Delphi source (Object Pascal) in Emacs -;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Ray Blaak diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el index a1b3658c0b4..f393f78203b 100644 --- a/lisp/progmodes/ebnf-abn.el +++ b/lisp/progmodes/ebnf-abn.el @@ -1,6 +1,7 @@ ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF) -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el index f0811d0ad80..fd58ec096b3 100644 --- a/lisp/progmodes/ebnf-bnf.el +++ b/lisp/progmodes/ebnf-bnf.el @@ -1,6 +1,6 @@ ;;; ebnf-bnf.el --- parser for EBNF -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el index 4a596154c43..a52469966fc 100644 --- a/lisp/progmodes/ebnf-dtd.el +++ b/lisp/progmodes/ebnf-dtd.el @@ -1,6 +1,7 @@ ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML) -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el index ada523c6c34..7e65611cedf 100644 --- a/lisp/progmodes/ebnf-ebx.el +++ b/lisp/progmodes/ebnf-ebx.el @@ -1,6 +1,7 @@ ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX) -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el index 96ae2842863..7596d366a12 100644 --- a/lisp/progmodes/ebnf-iso.el +++ b/lisp/progmodes/ebnf-iso.el @@ -1,6 +1,6 @@ ;;; ebnf-iso.el --- parser for ISO EBNF -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el index 4beeaa8ad8f..df18beb690a 100644 --- a/lisp/progmodes/ebnf-otz.el +++ b/lisp/progmodes/ebnf-otz.el @@ -1,6 +1,6 @@ ;;; ebnf-otz.el --- syntactic chart OpTimiZer -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el index 49f69f857ac..6e5465f0f01 100644 --- a/lisp/progmodes/ebnf-yac.el +++ b/lisp/progmodes/ebnf-yac.el @@ -1,6 +1,6 @@ ;;; ebnf-yac.el --- parser for Yacc/Bison -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index 18d88c92699..bce4381c614 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -1,6 +1,6 @@ ;;; ebnf2ps.el --- translate an EBNF to a syntactic chart on PostScript -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el index 47e9a12f235..d9060a318e5 100644 --- a/lisp/progmodes/ebrowse.el +++ b/lisp/progmodes/ebrowse.el @@ -1,7 +1,7 @@ ;;; ebrowse.el --- Emacs C++ class browser & tags facility ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -;; 2002, 2003, 2004, 2005 +;; 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation Inc. ;; Author: Gerd Moellmann diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index d9f4698ecf7..6fe9fec3094 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -1,7 +1,7 @@ ;;; etags.el --- etags facility for Emacs ;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1998, -;; 2000, 2001, 2002, 2003, 2004, 2005 +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Roland McGrath diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el index 615e9d0ae93..e74208431a3 100644 --- a/lisp/progmodes/executable.el +++ b/lisp/progmodes/executable.el @@ -1,6 +1,6 @@ ;;; executable.el --- base functionality for executable interpreter scripts -*- byte-compile-dynamic: t -*- -;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 5f58a3c2ec0..755e83646fc 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -4,7 +4,8 @@ ;; Maintainer: FSF ;; Keywords: unix, tools -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -2968,6 +2969,35 @@ BUFFER nil or omitted means use the current buffer." (gdb-invalidate-assembler)) +;; For debugging Emacs only (assumes that usual stack buffer already exists). +(defun gdb-xbacktrace () + "Generate a full lisp level backtrace with arguments." + (interactive) + (setq my-frames nil) + (with-current-buffer (get-buffer-create "xbacktrace") + (erase-buffer)) + (let (frame-number gdb-frame-number) + (with-current-buffer (gdb-get-buffer 'gdb-stack-buffer) + (save-excursion + (goto-char (point-min)) + (while (search-forward "in Ffuncall " nil t) + (goto-char (line-beginning-position)) + (looking-at "^#\\([0-9]+\\)") + (push (match-string-no-properties 1) my-frames) + (forward-line 1)))) + (dolist (frame my-frames) + (gdb-enqueue-input (list (concat "server frame " frame "\n") + 'ignore)) +; (gdb-enqueue-input (list "server ppargs\n" 'gdb-get-arguments)) + (gud-basic-call "server ppargs") +) + (gdb-enqueue-input (list (concat "server frame " frame-number "\n") + 'ignore)))) + +(defun gdb-get-arguments () + (with-current-buffer "xbacktrace" + (insert-buffer-substring (gdb-get-buffer 'gdb-partial-output-buffer)))) + ;; Code specific to GDB 6.4 (defconst gdb-source-file-regexp-1 "fullname=\"\\(.*?\\)\"") diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el index d19f636ff93..6009fe7d961 100644 --- a/lisp/progmodes/glasses.el +++ b/lisp/progmodes/glasses.el @@ -1,6 +1,6 @@ ;;; glasses.el --- make cantReadThis readable -;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2005, 2006 Free Software Foundation, Inc. ;; Author: Milan Zamazal ;; Maintainer: Milan Zamazal diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 48d1c09d138..0e151ce9be2 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -1,7 +1,7 @@ ;;; grep.el --- run Grep as inferior of Emacs, parse match messages ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Roland McGrath ;; Maintainer: FSF diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 7a8745f0e9c..b927c765476 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -5,7 +5,7 @@ ;; Keywords: unix, tools ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 1f843dea03c..04e44e2dac1 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -1,6 +1,6 @@ ;;; hideif.el --- hides selected code within ifdef -;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004 2005 +;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Daniel LaLiberte diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index ddc0e277200..e7ed67ce61c 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -1,7 +1,7 @@ ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Thien-Thi Nguyen ;; Dan Nicolaescu diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el index dc2cfd01683..393ba6dfb08 100644 --- a/lisp/progmodes/icon.el +++ b/lisp/progmodes/icon.el @@ -1,6 +1,6 @@ ;;; icon.el --- mode for editing Icon code -;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Chris Smith diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el index bc659666a08..cec25fcc25e 100644 --- a/lisp/progmodes/idlw-complete-structtag.el +++ b/lisp/progmodes/idlw-complete-structtag.el @@ -1,5 +1,6 @@ ;;; idlw-complete-structtag.el --- Completion of structure tags. -;; Copyright (c) 2001, 2002, 2003, 2004, 2005 Free Software Foundation +;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Maintainer: J.D. Smith diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 0a848128032..17961fa7d9a 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -1,7 +1,7 @@ ;;; idlw-help.el --- HTML Help code for IDLWAVE ;; Copyright (c) 2000 Carsten Dominik ;; Copyright (c) 2001, 2002 J.D. Smith -;; Copyright (c) 2003, 2004, 2005, Free Software Foundation +;; Copyright (c) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; ;; Authors: J.D. Smith ;; Carsten Dominik diff --git a/lisp/progmodes/idlw-rinfo.el b/lisp/progmodes/idlw-rinfo.el index 367de774bcf..dfb08b289a5 100644 --- a/lisp/progmodes/idlw-rinfo.el +++ b/lisp/progmodes/idlw-rinfo.el @@ -1,7 +1,7 @@ ;;; idlw-rinfo.el --- Routine Information for IDLWAVE ;; Copyright (c) 1999 Carsten Dominik -;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: J.D. Smith ;; Version: 5.7_22 diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 27360a54969..ff1bb7b689f 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -1,6 +1,6 @@ ;; idlw-shell.el --- run IDL as an inferior process of Emacs. -;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: J.D. Smith ;; Carsten Dominik diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el index 08dd08335bb..af94d02ec91 100644 --- a/lisp/progmodes/idlw-toolbar.el +++ b/lisp/progmodes/idlw-toolbar.el @@ -1,6 +1,6 @@ ;;; idlw-toolbar.el --- a debugging toolbar for IDLWAVE -;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Maintainer: J.D. Smith diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 3ee01d07b0a..03d181da250 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -1,6 +1,6 @@ ;; idlwave.el --- IDL editing mode for GNU Emacs -;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Authors: J.D. Smith ;; Carsten Dominik diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 64845e38aea..092c7736c27 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -1,6 +1,6 @@ ;;; inf-lisp.el --- an inferior-lisp mode -;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Olin Shivers diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el index bdb386dc5e9..ec12468e5d9 100644 --- a/lisp/progmodes/ld-script.el +++ b/lisp/progmodes/ld-script.el @@ -1,6 +1,7 @@ ;;; ld-script.el --- GNU linker script editing mode for Emacs -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Masatake YAMATO ;; Keywords: languages, faces diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el index 84174e2ca5d..af719a2854b 100644 --- a/lisp/progmodes/m4-mode.el +++ b/lisp/progmodes/m4-mode.el @@ -1,6 +1,6 @@ ;;; m4-mode.el --- m4 code editing commands for Emacs -;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Andrew Csillag diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 42a021ec692..3bbfeaac683 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -1,6 +1,6 @@ ;;; make-mode.el --- makefile editing commands for Emacs -;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Thomas Neumann diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el index 71791ef965b..d883254fdb7 100644 --- a/lisp/progmodes/mantemp.el +++ b/lisp/progmodes/mantemp.el @@ -1,6 +1,6 @@ ;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output -;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Tom Houlder diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index d113f94280f..3c4fdc2330e 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -1,6 +1,6 @@ ;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Ulrik Vieth diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el index 741ae8097a0..8b7084675d4 100644 --- a/lisp/progmodes/mixal-mode.el +++ b/lisp/progmodes/mixal-mode.el @@ -1,6 +1,6 @@ ;;; mixal-mode.el --- Major mode for the mix asm language. -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as diff --git a/lisp/progmodes/octave-hlp.el b/lisp/progmodes/octave-hlp.el index f9654ef71cb..18ea9c1f699 100644 --- a/lisp/progmodes/octave-hlp.el +++ b/lisp/progmodes/octave-hlp.el @@ -1,6 +1,6 @@ ;;; octave-hlp.el --- getting help on Octave symbols using info -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Kurt Hornik diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el index 67b5b108fa5..b6e6e4fc456 100644 --- a/lisp/progmodes/octave-inf.el +++ b/lisp/progmodes/octave-inf.el @@ -1,6 +1,6 @@ ;;; octave-inf.el --- running Octave as an inferior Emacs process -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Kurt Hornik diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 56dac972472..5f52e6f4d3c 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -1,6 +1,6 @@ ;;; octave-mod.el --- editing Octave source files under Emacs -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Kurt Hornik diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index d462557f291..02d5c509c62 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -1,7 +1,7 @@ ;;; pascal.el --- major mode for editing pascal source in Emacs ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Espen Skoglund ;; Keywords: languages diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index f5a857f9015..b0e31bafc28 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -1,6 +1,6 @@ ;;; perl-mode.el --- Perl code editing commands for GNU Emacs -;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: William F. Mann diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 9191d5f95ee..14b47475eb1 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -1,6 +1,6 @@ ;;; prolog.el --- major mode for editing and running Prolog under Emacs -;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Masanobu UMEDA diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index 299093b29bc..61b075b3bce 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -1,6 +1,6 @@ ;;; ps-mode.el --- PostScript mode for GNU Emacs -;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Peter Kleiweg diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 0ed58fd558e..f110828d602 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1,6 +1,6 @@ ;;; python.el --- silly walks for Python -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love ;; Maintainer: FSF diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index 26d6e05fc2c..ce420015326 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el @@ -1,7 +1,7 @@ ;;; scheme.el --- Scheme (and DSSSL) editing mode -;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Bill Rozas ;; Adapted-by: Dave Love diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 51291d717b6..e331268391a 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1,7 +1,7 @@ ;;; sh-script.el --- shell-script editing commands for Emacs -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer ;; Version: 2.0f diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el index eba9a03b2ae..891549ac2aa 100644 --- a/lisp/progmodes/simula.el +++ b/lisp/progmodes/simula.el @@ -1,6 +1,6 @@ ;;; simula.el --- SIMULA 87 code editing commands for Emacs -;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Hans Henrik Eriksen diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 6d73abb1432..ff5493de364 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -1,6 +1,6 @@ ;;; sql.el --- specialized comint.el for SQL interpreters -;; 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: Alex Schroeder diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index ed64de4c89c..d81a5fcf47b 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -1,6 +1,6 @@ ;;; vhdl-mode.el --- major mode for editing VHDL code -;; Copyright (C) 1992-2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992-2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Authors: Reto Zimmermann ;; Rodney J. Whitby diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el index 66d91dce3da..8ca7eb188ec 100644 --- a/lisp/progmodes/which-func.el +++ b/lisp/progmodes/which-func.el @@ -1,6 +1,6 @@ ;;; which-func.el --- print current function in mode line -;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Alex Rezinsky diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el index d568bca5b75..4f1cd37a9f7 100644 --- a/lisp/progmodes/xscheme.el +++ b/lisp/progmodes/xscheme.el @@ -1,6 +1,6 @@ ;;; xscheme.el --- run MIT Scheme under Emacs -;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Maintainer: FSF From 54068eae538e88f96058e159adb754e3ea76126a Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Fri, 10 Feb 2006 09:05:53 +0000 Subject: [PATCH 49/58] *** empty log message *** --- admin/FOR-RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index e0776ed9d92..ab17c84eab9 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -81,7 +81,7 @@ lisp/mh-e done Bill Wohler lisp/net done ttn lisp/obsolete done ttn lisp/play done Romain Francoise -lisp/progmodes working Nick Roberts +lisp/progmodes done Nick Roberts lisp/term done ttn lisp/textmodes done ttn lisp/url done ttn From be617bbf58e60b314cda414491ba5fc8bf798099 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 10 Feb 2006 11:07:50 +0000 Subject: [PATCH 50/58] (desktop-outvar): Fix typo. (desktop-save-buffer-p): Doc fix. --- lisp/ChangeLog | 5 +++++ lisp/desktop.el | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 226aba7a7ea..950b1e70872 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 Juanma Barranquero + + * desktop.el (desktop-outvar): Fix typo. + (desktop-save-buffer-p): Doc fix. + 2006-02-10 YAMAMOTO Mitsuharu * frame.el (select-frame-set-input-focus): Call x-focus-frame also diff --git a/lisp/desktop.el b/lisp/desktop.el index 8e37d5d0d36..f56e2204e78 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -57,17 +57,17 @@ ;; are supplied to handle special major and minor modes respectively. ;; `desktop-buffer-mode-handlers' is an alist of major mode specific functions ;; to restore a desktop buffer. Elements must have the form -;; +;; ;; (MAJOR-MODE . RESTORE-BUFFER-FUNCTION). -;; +;; ;; Functions listed are called by `desktop-create-buffer' when `desktop-read' ;; evaluates the desktop file. Buffers with a major mode not specified here, ;; are restored by the default handler `desktop-restore-file-buffer'. ;; `desktop-minor-mode-handlers' is an alist of functions to restore ;; non-standard minor modes. Elements must have the form -;; +;; ;; (MINOR-MODE . RESTORE-FUNCTION). -;; +;; ;; Functions are called by `desktop-create-buffer' to restore minor modes. ;; Minor modes not specified here, are restored by the standard minor mode ;; function. If you write a module that defines a major or minor mode that @@ -661,7 +661,7 @@ Not all types of values are supported." (defun desktop-outvar (varspec) "Output a setq statement for variable VAR to the desktop file. The argument VARSPEC may be the variable name VAR (a symbol), -or a cons cell of the form (VAR . MAX-SIZE), +or a cons cell of the form (VAR . MAX-SIZE), which means to truncate VAR's value to at most MAX-SIZE elements \(if the value is a list) before saving the value." (let (var size) @@ -684,7 +684,8 @@ which means to truncate VAR's value to at most MAX-SIZE elements (defun desktop-save-buffer-p (filename bufname mode &rest dummy) "Return t if buffer should have its state saved in the desktop file. FILENAME is the visited file name, BUFNAME is the buffer name, and -MODE is the major mode." +MODE is the major mode. +\n\(fn FILENAME BUFNAME MODE)" (let ((case-fold-search nil)) (and (not (string-match desktop-buffers-not-to-save bufname)) (not (memq mode desktop-modes-not-to-save)) From 1c51d057c46809c8ea955c77aeca844a12d02268 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 10 Feb 2006 16:46:43 +0000 Subject: [PATCH 51/58] (substitute-key-definition): Fix typo. --- lisp/subr.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/subr.el b/lisp/subr.el index 5abecd35310..9f6ad65bb4c 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -561,7 +561,7 @@ In other words, OLDDEF is replaced with NEWDEF where ever it appears. Alternatively, if optional fourth argument OLDMAP is specified, we redefine in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP. -For most uses, it is simpler and safer to use command remappping like this: +For most uses, it is simpler and safer to use command remapping like this: \(define-key KEYMAP [remap OLDDEF] NEWDEF)" ;; Don't document PREFIX in the doc string because we don't want to ;; advertise it. It's meant for recursive calls only. Here's its From 4f1a394982942b218a0bfc77f41e7eb0d68f5d90 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 10 Feb 2006 17:11:56 +0000 Subject: [PATCH 52/58] *** empty log message *** --- lisp/ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 950b1e70872..8094050a70f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,8 @@ * desktop.el (desktop-outvar): Fix typo. (desktop-save-buffer-p): Doc fix. + * subr.el (substitute-key-definition): Fix typo. + 2006-02-10 YAMAMOTO Mitsuharu * frame.el (select-frame-set-input-focus): Call x-focus-frame also @@ -26,8 +28,7 @@ 2006-02-09 Lars Hansen - * hilit-chg.el: Add highlight-changes-mode to - desktop-locals-to-save. + * hilit-chg.el: Add highlight-changes-mode to desktop-locals-to-save. (highlight-changes-mode): Don't change desktop-locals-to-save. 2006-02-09 Chong Yidong From be397698619235d4526d6e47023d32ea038f6357 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Fri, 10 Feb 2006 20:04:50 +0000 Subject: [PATCH 53/58] (mh-search): Wrap code in (block mh-search ...) rather than use defun*. XEmacs cannot create a proper autoload for a defun*. --- lisp/mh-e/ChangeLog | 6 ++ lisp/mh-e/mh-search.el | 168 +++++++++++++++++++++-------------------- 2 files changed, 91 insertions(+), 83 deletions(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 19cffeabacb..349bae9f072 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,9 @@ +2006-02-10 Bill Wohler + + * mh-search.el (mh-search): Wrap code in (block mh-search ...) + rather than use defun*. XEmacs cannot create a proper autoload for + a defun*. + 2006-02-09 Bill Wohler * mh-utils.el (mh-folder-list): Don't replace "/*$" with "/" since diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index f1292dd8e1e..9980b6a9b68 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -81,8 +81,8 @@ message number, and optionally the match.") ;;; MH-Folder Commands ;;;###mh-autoload -(defun* mh-search (folder search-regexp - &optional redo-search-flag window-config) +(defun mh-search (folder search-regexp + &optional redo-search-flag window-config) "Search your MH mail. This command helps you find messages in your entire corpus of @@ -230,96 +230,98 @@ folder containing the index search results." mh-search-regexp-builder) (current-window-configuration) nil))) - ;; Redoing a sequence search? - (when (and redo-search-flag mh-index-data mh-index-sequence-search-flag - (not mh-flists-called-flag)) - (let ((mh-flists-called-flag t)) - (apply #'mh-index-sequenced-messages mh-index-previous-search)) - (return-from mh-search)) - ;; We have fancy query parsing. - (when (symbolp search-regexp) - (mh-search-folder folder window-config) - (return-from mh-search)) - ;; Begin search proper. - (mh-checksum-choose) - (let ((result-count 0) - (old-window-config (or window-config mh-previous-window-config)) - (previous-search mh-index-previous-search) - (index-folder (format "%s/%s" mh-index-folder - (mh-index-generate-pretty-name search-regexp)))) - ;; Create a new folder for the search results or recreate the old one... - (if (and redo-search-flag mh-index-previous-search) - (let ((buffer-name (buffer-name (current-buffer)))) - (mh-process-or-undo-commands buffer-name) - (save-excursion (mh-exec-cmd-quiet nil "rmf" buffer-name)) - (mh-exec-cmd-quiet nil "folder" "-create" "-fast" buffer-name) - (setq index-folder buffer-name)) - (setq index-folder (mh-index-new-folder index-folder search-regexp))) + (block mh-search + ;; Redoing a sequence search? + (when (and redo-search-flag mh-index-data mh-index-sequence-search-flag + (not mh-flists-called-flag)) + (let ((mh-flists-called-flag t)) + (apply #'mh-index-sequenced-messages mh-index-previous-search)) + (return-from mh-search)) + ;; We have fancy query parsing. + (when (symbolp search-regexp) + (mh-search-folder folder window-config) + (return-from mh-search)) + ;; Begin search proper. + (mh-checksum-choose) + (let ((result-count 0) + (old-window-config (or window-config mh-previous-window-config)) + (previous-search mh-index-previous-search) + (index-folder (format "%s/%s" mh-index-folder + (mh-index-generate-pretty-name search-regexp)))) + ;; Create a new folder for the search results or recreate the old one... + (if (and redo-search-flag mh-index-previous-search) + (let ((buffer-name (buffer-name (current-buffer)))) + (mh-process-or-undo-commands buffer-name) + (save-excursion (mh-exec-cmd-quiet nil "rmf" buffer-name)) + (mh-exec-cmd-quiet nil "folder" "-create" "-fast" buffer-name) + (setq index-folder buffer-name)) + (setq index-folder (mh-index-new-folder index-folder search-regexp))) - (let ((folder-path (format "%s%s" mh-user-path (substring folder 1))) - (folder-results-map (make-hash-table :test #'equal)) - (origin-map (make-hash-table :test #'equal))) - ;; Run search program... - (message "Executing %s... " mh-searcher) - (funcall mh-search-function folder-path search-regexp) + (let ((folder-path (format "%s%s" mh-user-path (substring folder 1))) + (folder-results-map (make-hash-table :test #'equal)) + (origin-map (make-hash-table :test #'equal))) + ;; Run search program... + (message "Executing %s... " mh-searcher) + (funcall mh-search-function folder-path search-regexp) - ;; Parse searcher output. - (message "Processing %s output... " mh-searcher) - (goto-char (point-min)) - (loop for next-result = (funcall mh-search-next-result-function) - while next-result - do (unless (eq next-result 'error) - (unless (gethash (car next-result) folder-results-map) - (setf (gethash (car next-result) folder-results-map) - (make-hash-table :test #'equal))) - (setf (gethash (cadr next-result) - (gethash (car next-result) folder-results-map)) - t))) + ;; Parse searcher output. + (message "Processing %s output... " mh-searcher) + (goto-char (point-min)) + (loop for next-result = (funcall mh-search-next-result-function) + while next-result + do (unless (eq next-result 'error) + (unless (gethash (car next-result) folder-results-map) + (setf (gethash (car next-result) folder-results-map) + (make-hash-table :test #'equal))) + (setf (gethash (cadr next-result) + (gethash (car next-result) folder-results-map)) + t))) - ;; Copy the search results over. - (maphash #'(lambda (folder msgs) - (let ((cur (car (mh-translate-range folder "cur"))) - (msgs (sort (loop for msg being the hash-keys of msgs - collect msg) - #'<))) - (mh-exec-cmd "refile" msgs "-src" folder - "-link" index-folder) - ;; Restore cur to old value, that refile changed - (when cur - (mh-exec-cmd-quiet nil "mark" folder "-add" "-zero" - "-sequence" "cur" (format "%s" cur))) - (loop for msg in msgs - do (incf result-count) - (setf (gethash result-count origin-map) - (cons folder msg))))) - folder-results-map) + ;; Copy the search results over. + (maphash #'(lambda (folder msgs) + (let ((cur (car (mh-translate-range folder "cur"))) + (msgs (sort (loop for msg being the hash-keys of msgs + collect msg) + #'<))) + (mh-exec-cmd "refile" msgs "-src" folder + "-link" index-folder) + ;; Restore cur to old value, that refile changed + (when cur + (mh-exec-cmd-quiet nil "mark" folder "-add" "-zero" + "-sequence" + "cur" (format "%s" cur))) + (loop for msg in msgs + do (incf result-count) + (setf (gethash result-count origin-map) + (cons folder msg))))) + folder-results-map) - ;; Vist the results folder. - (mh-visit-folder index-folder () (list folder-results-map origin-map)) + ;; Vist the results folder. + (mh-visit-folder index-folder () (list folder-results-map origin-map)) - (goto-char (point-min)) - (forward-line) - (mh-update-sequences) - (mh-recenter nil) + (goto-char (point-min)) + (forward-line) + (mh-update-sequences) + (mh-recenter nil) - ;; Update the speedbar, if needed. - (when (mh-speed-flists-active-p) - (mh-speed-flists t mh-current-folder)) + ;; Update the speedbar, if needed. + (when (mh-speed-flists-active-p) + (mh-speed-flists t mh-current-folder)) - ;; Maintain history. - (when (or (and redo-search-flag previous-search) window-config) - (setq mh-previous-window-config old-window-config)) - (setq mh-index-previous-search (list folder mh-searcher search-regexp)) + ;; Maintain history. + (when (or (and redo-search-flag previous-search) window-config) + (setq mh-previous-window-config old-window-config)) + (setq mh-index-previous-search (list folder mh-searcher search-regexp)) - ;; Write out data to disk. - (unless mh-flists-called-flag (mh-index-write-data)) + ;; Write out data to disk. + (unless mh-flists-called-flag (mh-index-write-data)) - (message "%s found %s matches in %s folders" - (upcase-initials (symbol-name mh-searcher)) - (loop for msg-hash being hash-values of mh-index-data - sum (hash-table-count msg-hash)) - (loop for msg-hash being hash-values of mh-index-data - count (> (hash-table-count msg-hash) 0)))))) + (message "%s found %s matches in %s folders" + (upcase-initials (symbol-name mh-searcher)) + (loop for msg-hash being hash-values of mh-index-data + sum (hash-table-count msg-hash)) + (loop for msg-hash being hash-values of mh-index-data + count (> (hash-table-count msg-hash) 0))))))) ;; Shush compiler. (eval-when-compile (mh-do-in-xemacs (defvar pick-folder))) From 0ddb0ae836e507dc227fc518648a646a9918e448 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 10 Feb 2006 22:36:01 +0000 Subject: [PATCH 54/58] (Findirect_function): Rewrite docstring. Fix omission bug: Declare new arg NOERROR. --- src/ChangeLog | 5 +++++ src/data.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d5a57e890ef..b3c11b95140 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-02-10 Thien-Thi Nguyen + + * data.c (Findirect_function): Rewrite docstring. + Fix omission bug: Declare new arg NOERROR. + 2006-02-10 YAMAMOTO Mitsuharu * macfns.c (x_set_mouse_color): Don't call rif->define_frame_cursor diff --git a/src/data.c b/src/data.c index 7919021d061..73f712279d7 100644 --- a/src/data.c +++ b/src/data.c @@ -1929,15 +1929,15 @@ indirect_function (object) DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0, doc: /* Return the function at the end of OBJECT's function chain. -If OBJECT is a symbol, follow all function indirections and return the final -function binding. -If OBJECT is not a symbol, just return it. -If optional arg NOERROR is nil, signal a void-function error if -the final symbol is unbound. Otherwise, just return nil is unbound. +If OBJECT is not a symbol, just return it. Otherwise, follow all +function indirections to find the final function binding and return it. +If the final symbol in the chain is unbound, signal a void-function error. +Optional arg NOERROR non-nil means to return nil instead of signalling. Signal a cyclic-function-indirection error if there is a loop in the function chain of symbols. */) -(object, noerror) + (object, noerror) register Lisp_Object object; + Lisp_Object noerror; { Lisp_Object result; From 6295b3b11d0bf353d7afd2e1aa138374099720d5 Mon Sep 17 00:00:00 2001 From: Mathias Dahl Date: Fri, 10 Feb 2006 23:42:08 +0000 Subject: [PATCH 55/58] *** empty log message *** --- lisp/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8094050a70f..2686f9b2ff8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-02-11 Mathias Dahl + + * tumme.el (tumme-dir): Changed default value to + "~/.emacs-d/tumme" + (tumme-dir): New function. Copied from thumbs.el. + 2006-02-10 Juanma Barranquero * desktop.el (desktop-outvar): Fix typo. From 2f8953c2746d8afb43a969cbcd4345686504ace5 Mon Sep 17 00:00:00 2001 From: Mathias Dahl Date: Fri, 10 Feb 2006 23:43:02 +0000 Subject: [PATCH 56/58] (tumme-dir): Changed default value to "~/.emacs-d/tumme" (tumme-dir): New function. Copied from thumbs.el. --- lisp/tumme.el | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/lisp/tumme.el b/lisp/tumme.el index 0436a0cb55e..0e0b85248c0 100644 --- a/lisp/tumme.el +++ b/lisp/tumme.el @@ -57,8 +57,8 @@ ;; ;; `tumme' stores the thumbnail files in `tumme-dir' using the file ;; name format ORIGNAME.thumb.ORIGEXT. For example -;; ~/.tumme/myimage01.thumb.jpg. The "database" is for now just a -;; plain text file with the following format: +;; ~/.emacs.d/tumme/myimage01.thumb.jpg. The "database" is for now +;; just a plain text file with the following format: ;; ;; file-name-non-directory;comment:comment-text;tag1;tag2;tag3;...;tagN ;; @@ -508,6 +508,11 @@ ;; `thumme-thumb-name', `tumme-create-thumb', etc. His code to get ;; speedbar display tumme thumbnails, might be integrated soon. ;; +;; * Changed the default value of `tumme-dir' to "~/.emacs.d/tumme" +;; and added a new function, `tumme-dir' to handle the creating of +;; it. Code copied from thumbs.el. +;; +;; ;; TODO ;; ==== ;; @@ -572,8 +577,8 @@ :prefix "tumme-" :group 'files) -(defcustom tumme-dir "~/.tumme/" - "*Directory where thumbnail images for are stored." +(defcustom tumme-dir "~/.emacs.d/tumme/" + "*Directory where thumbnail images are stored." :type 'string :group 'tumme) @@ -589,17 +594,17 @@ means that each thumbnail is stored in a subdirectory called (const :tag "Per-directory" per-directory)) :group 'tumme) -(defcustom tumme-db-file "~/.tumme/.tumme_db" +(defcustom tumme-db-file "~/.emacs.d/tumme/.tumme_db" "*Database file where file names and their associated tags are stored." :type 'string :group 'tumme) -(defcustom tumme-temp-image-file "~/.tumme/.tumme_temp" +(defcustom tumme-temp-image-file "~/.emacs.d/tumme/.tumme_temp" "*Name of temporary image file used by various commands." :type 'string :group 'tumme) -(defcustom tumme-gallery-dir "~/.tumme/.tumme_gallery" +(defcustom tumme-gallery-dir "~/.emacs.d/tumme/.tumme_gallery" "*Directory to store generated gallery html pages. This path needs to be \"shared\" to the public so that it can access the index.html page that tumme creates." @@ -696,7 +701,7 @@ original image file name and %t which is replaced by :group 'tumme) (defcustom tumme-temp-rotate-image-file - "~/.tumme/.tumme_rotate_temp" + "~/.emacs.d/tumme/.tumme_rotate_temp" "*Temporary file for rotate operations." :type 'string :group 'tumme) @@ -851,6 +856,16 @@ before warning the user." :type 'integer :group 'tumme) +(defun tumme-dir () + "Return the current thumbnails directory (from `tumme-dir'). +Create the thumbnails directory if it does not exist." + (let ((tumme-dir (file-name-as-directory + (expand-file-name tumme-dir)))) + (unless (file-directory-p tumme-dir) + (make-directory tumme-dir t) + (message "Creating thumbnails directory")) + tumme-dir)) + (defun tumme-insert-image (file type relief margin) "Insert image FILE of image TYPE, using RELIEF and MARGIN, at point." @@ -909,7 +924,7 @@ add a subdirectory." ;; be used here. (setq md5-hash (md5 (file-name-as-directory (file-name-directory file)))) - (file-name-as-directory (expand-file-name tumme-dir))) + (file-name-as-directory (expand-file-name (tumme-dir)))) ((eq 'per-directory tumme-thumbnail-storage) (format "%s.tumme/" (file-name-directory f)))) @@ -2710,7 +2725,7 @@ when using per-directory thumbnail file storage")) ;; (let ((fattribs (file-attributes f))) ;; ;; Get last access time and file size ;; `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f))) -;; (directory-files tumme-dir t ".+\.thumb\..+$")) +;; (directory-files (tumme-dir) t ".+\.thumb\..+$")) ;; ;; Sort function. Compare time between two files. ;; '(lambda (l1 l2) ;; (time-less-p (car l1) (car l2))))) From 04bf678313e88efb5ed46b3d07e1a43b69ef04bb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 11 Feb 2006 00:04:32 +0000 Subject: [PATCH 57/58] (Fsubstitute_command_keys): Doc fix. --- src/doc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc.c b/src/doc.c index 0e1042b95a5..3dd5622d9df 100644 --- a/src/doc.c +++ b/src/doc.c @@ -739,7 +739,7 @@ Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke sequence that will invoke COMMAND, or "M-x COMMAND" if COMMAND is not on any keys. Substrings of the form \\=\\{MAPVAR} are replaced by summaries -\(made by describe-bindings) of the value of MAPVAR, taken as a keymap. +\(made by `describe-bindings') of the value of MAPVAR, taken as a keymap. Substrings of the form \\=\\ specify to use the value of MAPVAR as the keymap for future \\=\\[COMMAND] substrings. \\=\\= quotes the following character and is discarded; From 9d64cd1339707277e541b6c54f847240464f65ec Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sat, 11 Feb 2006 00:06:28 +0000 Subject: [PATCH 58/58] Revision: emacs@sv.gnu.org/emacs--devo--0--patch-65 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 27-28) - Update from CVS: lisp/gnus.el: Remove bogus comment. - Merge from emacs--devo--0 --- lisp/gnus/ChangeLog | 102 ++++++++++++++++++++++++++++++++++++++++++-- lisp/gnus/gnus.el | 3 -- 2 files changed, 99 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f7c9732565c..be9436d350c 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2006-02-10 Reiner Steib + + * gnus.el: Remove bogus comment. + 2006-02-09 Daiki Ueno * pgg-gpg.el (pgg-gpg-encrypt-region): Don't convert line-endings @@ -84,7 +88,7 @@ * gnus-util.el (gnus-error): Describe `args'. -2006-02-03 Andreas Seltenreich +2006-02-03 Andreas Seltenreich * nnweb.el (nnweb-request-group): Avoid growing overview files. @@ -101,7 +105,7 @@ * mml.el (mml-generate-mime-1): Correct the order of inline signed parts. -2006-01-31 Andreas Seltenreich +2006-01-31 Andreas Seltenreich * nnweb.el (nnweb-group-alist): Use defvar instead of defvoo, there's only one active file for all servers. @@ -142,7 +146,7 @@ * nnweb.el (nnweb-google-parse-1): Clarify some comments. -2006-01-30 Andreas Seltenreich +2006-01-30 Andreas Seltenreich * nnweb.el (nnweb-type-definition, nnweb-google-parse-1) (nnweb-google-create-mapping, nnweb-google-search): Adapt to @@ -500,6 +504,98 @@ as a buffer-local variable. This avoids creating truncated dribble files as a result of a hang up, eg. +2005-11-04 Ken Manheimer + + * pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region) + (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric) + (pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt) + (pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase' + argument to all these routines, so the passphrase can be managed + externally and passed in to the system. + (pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for + pgg-add-passphrase-to-cache function. + + * pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region) + (pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric) + (pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt) + (pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase' + argument to all these routines, so the passphrase can be managed + externally and passed in to the system. + (pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache + function. + +2005-10-29 Ken Manheimer + + * pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right + part of the decoded armor to find the key-identifier. + (pgg-gpg-lookup-key-owner): New function to return the + human-readable identifier of a key owner. + (pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the + key itself. + (pgg-gpg-decrypt-region): Prompt with the key owner (rather than + the key value) if we have a key and can match it against a secret + key. Also, added a note pointing out fact that the prompt only + indicates the first matching key. + + * pgg.el (pgg-decrypt): Passing along 'passphrase' in call to + pgg-decrypt-region. + (pgg-pending-timers): A new hash for tracking the passphrase cache + timers, so that new ones supercede old ones. + (pgg-add-passphrase-to-cache): Rename from + `pgg-add-passphrase-cache' to reduce confusion (all callers + changed). Modified to cancel old timers when new ones are added. + (pgg-remove-passphrase-from-cache): Rename from + `pgg-remove-passphrase-cache' to reduce confusion (all callers + changed). Modified to cancel old timers when their keys are + removed from the cache. + (pgg-cancel-timer): In Emacs, an alias for cancel-timer; in + XEmacs, an indirection to delete-itimer. + (pgg-read-passphrase-from-cache, pgg-read-passphrase): + Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so + users can only check cache without risk of prompting. Correct bug in + notruncate behavior. + (pgg-read-passphrase-from-cache, pgg-read-passphrase) + (pgg-add-passphrase-cache, pgg-remove-passphrase-cache): + Add informative docstrings. + (pgg-decrypt): Convey provided passphrase in subordinate call to + pgg-decrypt-region. + +2005-10-20 Ken Manheimer + + * pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region) + (pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region) + (pgg-decrypt, pgg-sign-region, pgg-sign): Add optional + 'passphrase' argument, so the passphrase can be managed externally + and then passed in to the system. + + * pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache) + (pgg-remove-passphrase-cache): Add optional 'notruncate' argument, + so the passphrase cache can be used reliably with identifiers + besides a pgp packet's key id. + + * pgg-gpg.el (pgg-pgp-encrypt-region) + (pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric) + (pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt) + (pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase' + argument to all these routines, so the passphrase can be managed + externally and passed in to the system. + + * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional + 'notruncate' argument, so the passphrase cache can be used + reliably with identifiers besides a pgp packet's key id. + +2005-10-29 Sascha Wilde + + * pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for + symmetric encryption. + (pgg-gpg-symmetric-key-p): New function to check for an symmetric + encrypted session key. + (pgg-gpg-decrypt-region): When decrypting a symmetric encrypted + message ask for the passphrase in a proper way. + + * pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region): + New user commands for symmetric encryption. + 2005-11-30 Stefan Monnier * gnus-delay.el (gnus-delay-group): Don't autoload. diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 359e48cb701..2caccc0b70e 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -4257,9 +4257,6 @@ current display is used." (delete-frame gnus-other-frame-object)) (setq gnus-other-frame-object nil))))))) -;;(setq thing ? ; this is a comment -;; more 'yes) - ;;;###autoload (defun gnus (&optional arg dont-connect slave) "Read network news.