comparison lisp/ChangeLog @ 106981:e3fcbe16deae

merge conflict
author Mark A. Hershberger <mhershberger@intrahealth.org>
date Sun, 24 Jan 2010 23:52:26 -0500
parents 66e0d01014c6 1c559638a806
children 38312121c181
comparison
equal deleted inserted replaced
106980:66e0d01014c6 106981:e3fcbe16deae
1 2010-01-19 Mark A. Hershberger <mah@everybody.org> 1 2010-01-24 Mark A. Hershberger <mah@everybody.org>
2 2
3 * progmodes/python.el: Replace reference to obsolete c-subward-mode. 3 * progmodes/python.el: Replace reference to obsolete c-subward-mode.
4
5 2010-01-24 Dan Nicolaescu <dann@ics.uci.edu>
6
7 Remove support for adding --signoff on commit.
8 Future support will use an incompatible generic mechanism.
9 * vc-git.el (vc-git-add-signoff): Remove variable.
10 (vc-git-toggle-signoff): Remove function.
11 (vc-git-extra-menu-map): Do not bind vc-git-toggle-signoff.
12
13 * term/xterm.el (xterm-maybe-set-dark-background-mode): Rename
14 from xterm-set-background-mode. Return t if the background mode
15 was set.
16 (terminal-init-xterm): Move tty-set-up-initial-frame-faces
17 earlier, call it again in case the background mode has changed.
18
19 2010-01-23 Dmitri Paduchikh <dpaduch@k66.ru> (tiny change)
20
21 * emacs-lisp/advice.el (ad-set-orig-definition): Fix typo
22 (Bug#3541).
23
24 2010-01-23 Chong Yidong <cyd@stupidchicken.com>
25
26 * emacs-lisp/assoc.el (aelement): Doc fix.
27 (aput, adelete, amake): Use lexical-let (Bug#5450).
28
29 2010-01-23 Stephen Leake <stephen_leake@member.fsf.org>
30
31 * progmodes/ada-mode.el (ada-in-paramlist-p): Pragma syntax
32 is the same as subprogram call, not declaration. (Bug#5435).
33
34 2010-01-23 Michael Albinus <michael.albinus@gmx.de>
35
36 * net/tramp-smb.el (tramp-smb-conf): New defcustom.
37 (tramp-smb-maybe-open-connection): Use it.
38
39 2010-01-22 Michael Albinus <michael.albinus@gmx.de>
40
41 * net/tramp-imap.el (top): Autoload needed packages. (Bug#5448)
42
43 2010-01-22 Stefan Monnier <monnier@iro.umontreal.ca>
44
45 * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte
46 just because we see "encoding: 8bit".
47 * mail/rmail.el (rmail-show-message-1): Decode the body's QP into bytes.
48
49 2010-01-22 Chong Yidong <cyd@stupidchicken.com>
50
51 * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).
52
53 2010-01-22 Eli Zaretskii <eliz@gnu.org>
54
55 * jka-compr.el (jka-compr-load): If load-file is not in
56 load-history, try its file-truename version. (bug#5447)
57
58 2010-01-21 Alan Mackenzie <acm@muc.de>
59
60 Fix a situation where deletion of a cpp construct throws an error.
61 * progmodes/cc-engine.el (c-invalidate-state-cache): Before
62 invoking c-with-all-but-one-cpps-commented-out, check that the
63 special cpp construct is still in the buffer.
64 (c-parse-state): Record the special cpp with markers, not numbers.
65
66 2010-01-21 Kenichi Handa <handa@m17n.org>
67
68 * textmodes/sgml-mode.el (sgml-maybe-name-self): No need to
69 process last-command-event, as it is now decoded first (Bug#5380).
70
71 2010-01-20 Chong Yidong <cyd@stupidchicken.com>
72
73 * term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330).
74
75 2010-01-20 Glenn Morris <rgm@gnu.org>
76
77 * indent.el (tab-always-indent): Fix custom-type.
78
79 2010-01-19 Alan Mackenzie <acm@muc.de>
80
81 * progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty
82 buffer throws "args out of range".
83 (c-set-cpp-delimiters, c-clear-cpp-delimiters): Check for EOB
84 playing the role of delimiter.
4 85
5 2010-01-18 Stephen Leake <stephen_leake@member.fsf.org> 86 2010-01-18 Stephen Leake <stephen_leake@member.fsf.org>
6 87
7 * lisp/progmodes/ada-mode.el: Fix bug#5400. 88 * lisp/progmodes/ada-mode.el: Fix bug#5400.
8 (ada-matching-decl-start-re): Move into ada-goto-decl-start. 89 (ada-matching-decl-start-re): Move into ada-goto-decl-start.