Commit 2f12b713 authored by Miles Bader's avatar Miles Bader
Browse files

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 75-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

2007-07-29  Kimit Yada  <kimitto@gmail.com>  (tiny change)

   * lisp/emacs-lisp/copyright.el (copyright-update-year, copyright-update)
   (copyright-fix-years, copyright): Correctly handle the case where
   copyright-limit is nil.

2007-07-28  Konstantin Novitsky  <knovitsk@Bear.com>  (tiny change)

   * lisp/progmodes/python.el (run-python): Fix path separator under w32.

2007-07-24  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-msg.el (gnus-summary-supersede-article)
   (gnus-summary-resend-message-edit): Add Gcc header.
   (gnus-summary-resend-bounced-mail): Ditto; search whole body for parent
   article's Message-ID; refer parent article in summary buffer.

   * lisp/gnus/message.el (message-bounce): Call mime-to-mml.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-838
parents 22eca14e bd53d37c
......@@ -47,6 +47,12 @@ that branch. Do not make manual changes to this file on the trunk.
** michael.ewe@arcor.de, Apr 24: 22.0.98 not starting on Solaris 10/I386
http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
** davby@ida.liu.se, 6 July: Bug in pos-visible-in-window-p
** dak@gnu.org, 30 May: Redraw problem with overlapping frames
** dksw@eircom.net, 3 Jul: Telnet mode (rsh/ssh)
* FIXES FOR EMACS 22.2
Here we list small fixes that arrived too late for Emacs 22.1, but
......
......@@ -63,8 +63,12 @@ in to make it use the scrollbars from the system theme.
** VC
*** VC backends can provide completion of revision names.
*** VC has some support for Mercurial (hg).
*** VC has some support for Git.
* Installation Changes in Emacs 22.1
......
2007-07-29 Kimit Yada <kimitto@gmail.com> (tiny change)
* emacs-lisp/copyright.el (copyright-update-year, copyright-update)
(copyright-fix-years, copyright): Correctly handle the case where
copyright-limit is nil.
2007-07-28 Konstantin Novitsky <knovitsk@Bear.com> (tiny change)
* progmodes/python.el (run-python): Fix path separator under w32.
2007-07-30 Richard Stallman <rms@gnu.org>
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table):
......
......@@ -46,8 +46,8 @@ A value of nil means to search whole buffer."
;; The character classes have the Latin-1 version and the Latin-9
;; version, which is probably enough.
(defcustom copyright-regexp
"\\([©Ž©]\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *\\(?:(C)\\)?\
\\|[Cc]opyright\\s *:?\\s *[©Ž©]\\)\
"\\([©©]\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *\\(?:(C)\\)?\
\\|[Cc]opyright\\s *:?\\s *[©©]\\)\
\\s *\\([1-9]\\([-0-9, ';/*%#\n\t]\\|\\s<\\|\\s>\\)*[0-9]+\\)"
"What your copyright notice looks like.
The second \\( \\) construct must match the years."
......@@ -95,7 +95,8 @@ When this is `function', only ask when called non-interactively."
(re-search-forward (concat "\\(" copyright-regexp
"\\)\\([ \t]*\n\\)?.*\\(?:"
copyright-names-regexp "\\)")
(+ (point) copyright-limit) t)
(if copyright-limit (+ (point) copyright-limit))
t)
;; In case the regexp is rejected. This is useful because
;; copyright-update is typically called from before-save-hook where
;; such an error is very inconvenient for the user.
......@@ -176,10 +177,11 @@ interactively."
(and copyright-current-gpl-version
;; match the GPL version comment in .el files, including the
;; bilingual Esperanto one in two-column, and in texinfo.tex
(re-search-forward "\\(the Free Software Foundation;\
(re-search-forward
"\\(the Free Software Foundation;\
either \\|; a\\^u eldono \\([0-9]+\\)a, ? a\\^u (la\\^u via \\)\
version \\([0-9]+\\), or (at"
(+ (point) copyright-limit) t)
(if copyright-limit (+ (point) copyright-limit)) t)
(not (string= (match-string 3) copyright-current-gpl-version))
(or noquery
(y-or-n-p (concat "Replace GPL version by "
......@@ -201,7 +203,8 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx."
(interactive)
(widen)
(goto-char (point-min))
(if (re-search-forward copyright-regexp (+ (point) copyright-limit) t)
(if (re-search-forward copyright-regexp
(if copyright-limit (+ (point) copyright-limit)) t)
(let ((s (match-beginning 2))
(e (copy-marker (1+ (match-end 2))))
(p (make-marker))
......@@ -241,7 +244,7 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx."
"Copyright (C) " `(substring (current-time-string) -4) " by "
(or (getenv "ORGANIZATION")
str)
'(if (> (point) (+ (point-min) copyright-limit))
'(if (and copyright-limit (> (point) (+ (point-min) copyright-limit)))
(message "Copyright extends beyond `copyright-limit' and won't be updated automatically."))
comment-end \n)
......
......@@ -2,6 +2,15 @@
* Relicense all FSF files to GPLv3 or later.
2007-07-24 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-msg.el (gnus-summary-supersede-article)
(gnus-summary-resend-message-edit): Add Gcc header.
(gnus-summary-resend-bounced-mail): Ditto; search whole body for parent
article's Message-ID; refer parent article in summary buffer.
* message.el (message-bounce): Call mime-to-mml.
2007-07-21 Reiner Steib <Reiner.Steib@gmx.de>
* mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
......
......@@ -815,7 +815,10 @@ header line with the old Message-ID."
(set-buffer ,gnus-summary-buffer)
(gnus-cache-possibly-remove-article ,article nil nil nil t)
(gnus-summary-mark-as-read ,article gnus-canceled-mark)))))
message-send-actions))))
message-send-actions)
;; Add Gcc header.
(gnus-inews-insert-archive-gcc)
(gnus-inews-insert-gcc))))
......@@ -1280,10 +1283,13 @@ composing a new message."
(message-narrow-to-head-1)
;; Gnus will generate a new one when sending.
(message-remove-header "Message-ID")
(message-remove-header message-ignored-resent-headers t)
;; Remove unwanted headers.
(message-remove-header message-ignored-resent-headers t)
(goto-char (point-max))
(insert mail-header-separator)
;; Add Gcc header.
(gnus-inews-insert-archive-gcc)
(gnus-inews-insert-gcc)
(goto-char (point-min))
(when (re-search-forward "^To:\\|^Newsgroups:" nil 'move)
(forward-char 1))
......@@ -1557,15 +1563,29 @@ If FETCH, try to fetch the article that this is a reply to, if indeed
this is a reply."
(interactive "P")
(gnus-summary-select-article t)
(set-buffer gnus-original-article-buffer)
(gnus-setup-message 'compose-bounce
(let* ((references (mail-fetch-field "references"))
(parent (and references (gnus-parent-id references))))
(let (summary-buffer parent)
(if fetch
(progn
(setq summary-buffer (current-buffer))
(set-buffer gnus-original-article-buffer)
(article-goto-body)
(when (re-search-forward "^References:\n?" nil t)
(while (memq (char-after) '(?\t ? ))
(forward-line 1))
(skip-chars-backward "\t\n ")
(setq parent
(gnus-parent-id (buffer-substring (match-end 0) (point))))))
(set-buffer gnus-original-article-buffer))
(gnus-setup-message 'compose-bounce
(message-bounce)
;; Add Gcc header.
(gnus-inews-insert-archive-gcc)
(gnus-inews-insert-gcc)
;; If there are references, we fetch the article we answered to.
(and fetch parent
(gnus-summary-refer-article parent)
(gnus-summary-show-all-headers)))))
(when parent
(with-current-buffer summary-buffer
(gnus-summary-refer-article parent)
(gnus-summary-show-all-headers))))))
;;; Gcc handling.
......
......@@ -6697,7 +6697,7 @@ you."
(goto-char boundary)
(when (re-search-backward "^.?From .*\n" nil t)
(delete-region (match-beginning 0) (match-end 0)))))
(mm-enable-multibyte)
(mime-to-mml)
(save-restriction
(message-narrow-to-head-1)
(message-remove-header message-ignored-bounced-headers t)
......
......@@ -4,7 +4,7 @@
;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
;; Keywords: comm, processes
;; This file is part of GNU Emacs.
......
......@@ -1359,7 +1359,7 @@ buffer for a list of commands.)"
(path (getenv "PYTHONPATH"))
(process-environment ; to import emacs.py
(cons (concat "PYTHONPATH=" data-directory
(if path (concat ":" path)))
(if path (concat path-separator path)))
process-environment)))
(apply 'make-comint-in-buffer "Python"
(if new (generate-new-buffer "*Python*") "*Python*")
......
......@@ -148,7 +148,7 @@
(defun vc-hg-registered (file)
"Return non-nil if FILE is registered with hg."
(when (vc-hg-root file) ; short cut
(vc-hg-state file))) ; expensive
(vc-file-setprop file 'vc-state (vc-hg-state file)))) ; expensive
(defun vc-hg-state (file)
"Hg-specific version of `vc-state'."
......@@ -303,12 +303,12 @@
(buffer-substring-no-properties (point-min) (point-max))))))
;; Modelled after the similar function in vc-cvs.el
;; (defun vc-hg-revision-completion-table (file)
;; (lexical-let ((file file)
;; table)
;; (setq table (lazy-completion-table
;; table (lambda () (vc-hg-revision-table file))))
;; table))
(defun vc-hg-revision-completion-table (file)
(lexical-let ((file file)
table)
(setq table (lazy-completion-table
table (lambda () (vc-hg-revision-table file))))
table))
(defun vc-hg-diff-tree (file &optional oldvers newvers buffer)
(vc-hg-diff (list file) oldvers newvers buffer))
......
......@@ -16,10 +16,14 @@
2007-07-26 Dan Nicolaescu <dann@ics.uci.edu>
* vc2-xtra.texi (Customizing VC): Add GIT.
* vc2-xtra.texi (Customizing VC): Add GIT and HG.
* dired.texi (Wdired): Mention C-x C-q key binding.
2007-07-28 Nick Roberts <nickrob@snap.net.nz>
* building.texi (GDB Graphical Interface): Qualify use of "M-x gdba".
2007-07-25 Glenn Morris <rgm@gnu.org>
* calc.texi (Copying)
......
......@@ -832,7 +832,9 @@ session, or the custom variable @code{gud-gdb-command-name} for all
future sessions. You need to use text command mode to debug multiple
programs within one Emacs session. If you have customized
@code{gud-gdb-command-name} in this way, you can use @kbd{M-x gdba} to
invoke GDB in graphical mode.
invoke GDB in graphical mode. Moreover, this command succeeds where
@kbd{M-x gdb} fails, such as when your @file{.gdbinit} file contains
executable GDB commands.
@menu
* GDB-UI Layout:: Control the number of displayed buffers.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment