Mercurial > emacs

comparison lisp/ChangeLog @ 54403:a8163d589489

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 15 Mar 2004 18:06:06 +0000
parents 8bf3846fc7dd
children 1647b704e48e fac24544c283
comparison
equal deleted inserted replaced
54402:8bf3846fc7dd 54403:a8163d589489
1 2004-03-15 Masatake YAMATO <jet@gyve.org> 1 2004-03-15 Masatake YAMATO <jet@gyve.org>
2 2
3 Added context menu support in smerge mode. 3 Added context menu support in smerge mode.
4 Most of the part is written by Stefan Monnier. 4 Most of the part is written by Stefan Monnier.
5 5
6 * smerge-mode.el (smerge-context-menu-map, smerge-context-menu): New 6 * smerge-mode.el (smerge-context-menu-map, smerge-context-menu):
7 keyman and menu. 7 New keymap and menu.
8 (smerge-text-properties): New function. 8 (smerge-text-properties): New function.
9 (smerge-remove-props): New function. 9 (smerge-remove-props): New function.
10 (smerge-popup-context-menu): New function. 10 (smerge-popup-context-menu): New function.
11 (smerge-resolve): Call `smerge-remove-props'. 11 (smerge-resolve): Call `smerge-remove-props'.
12 (smerge-keep-base, smerge-keep-other, smerge-keep-mine): 12 (smerge-keep-base, smerge-keep-other, smerge-keep-mine): Ditto.
13 Ditto.
14 (smerge-keep-current): Ditto. 13 (smerge-keep-current): Ditto.
15 (smerge-kill-current): New function. 14 (smerge-kill-current): New function.
16 (smerge-match-conflict): Detect the file as `a same-diff conflict' 15 (smerge-match-conflict): Put text properties.
17 if the filename is "ANCESTOR". Put text properties. 16 Detect the file as `same-diff conflict' if the filename is "ANCESTOR".
18 17
19 2004-03-15 David Ponce <david@dponce.com> 18 2004-03-15 David Ponce <david@dponce.com>
20 19
21 * ruler-mode.el: (ruler-mode-left-fringe-cols) 20 * ruler-mode.el: (ruler-mode-left-fringe-cols)
22 (ruler-mode-right-fringe-cols, ruler-mode-left-scroll-bar-cols) 21 (ruler-mode-right-fringe-cols, ruler-mode-left-scroll-bar-cols)
23 (ruler-mode-right-scroll-bar-cols): Remove. 22 (ruler-mode-right-scroll-bar-cols): Remove.
24 (ruler-mode-window-col, ruler-mode-mouse-set-left-margin) 23 (ruler-mode-window-col, ruler-mode-mouse-set-left-margin)
25 (ruler-mode-mouse-set-right-margin, ruler-mode-ruler): Use 24 (ruler-mode-mouse-set-right-margin, ruler-mode-ruler):
26 fringe-columns and scroll-bar-columns. 25 Use fringe-columns and scroll-bar-columns.
27 26
28 2004-03-15 Masatake YAMATO <jet@gyve.org> 27 2004-03-15 Masatake YAMATO <jet@gyve.org>
29 28
30 * hl-line.el (hl-line-range-function): New variable. 29 * hl-line.el (hl-line-range-function): New variable.
31 (hl-line-move): New function. 30 (hl-line-move): New function.
32 (global-hl-line-highlight): Use `hl-line-move'. 31 (global-hl-line-highlight): Use `hl-line-move'.
33 (hl-line-highlight): Ditto. 32 (hl-line-highlight): Ditto.
34 33
35 * scroll-bar.el (scroll-bar-columns): New function derived from 34 * scroll-bar.el (scroll-bar-columns):
36 ruler-mode.el. 35 * fringe.el (fringe-columns): New function derived from ruler-mode.el.
37
38 * fringe.el (fringe-columns): New function derived from
39 ruler-mode.el.
40 36
41 * ruler-mode.el (top-level): Require scroll-bar and fringe. 37 * ruler-mode.el (top-level): Require scroll-bar and fringe.
42 (ruler-mode-left-fringe-cols) 38 (ruler-mode-left-fringe-cols)
43 (ruler-mode-right-fringe-cols): Use `fringe-columns'. 39 (ruler-mode-right-fringe-cols): Use `fringe-columns'.
44 (ruler-mode-right-scroll-bar-cols) 40 (ruler-mode-right-scroll-bar-cols)
47 (ruler-mode-header-line-format): Call `ruler-mode-ruler-function' 43 (ruler-mode-header-line-format): Call `ruler-mode-ruler-function'
48 if the value for `ruler-mode-ruler-function'is given. 44 if the value for `ruler-mode-ruler-function'is given.
49 45
50 * hexl.el (hexl-mode-hook): Make the hook customizable. 46 * hexl.el (hexl-mode-hook): Make the hook customizable.
51 (hexl-address-area, hexl-ascii-area): New customize variables. 47 (hexl-address-area, hexl-ascii-area): New customize variables.
52 (hexlify-buffer): Put font-lock-faces on the address area and 48 (hexlify-buffer): Put font-lock-faces on the address area and
53 the ascii area. 49 the ascii area.
54 (hexl-activate-ruler): New function. 50 (hexl-activate-ruler): New function.
55 (hexl-follow-line): New function. 51 (hexl-follow-line): New function.
56 (hexl-highlight-line-range): New function. 52 (hexl-highlight-line-range): New function.
57 (hexl-mode-ruler): New function. 53 (hexl-mode-ruler): New function.
54
55 2004-03-14 Stefan Monnier <monnier@iro.umontreal.ca>
56
57 * vc-hooks.el (vc-handled-backends): Add Arch. Move MCVS down.
58 (vc-default-find-file-hook): New fun.
59 (vc-find-file-hook): Call new find-file-hook operation.
60
61 * vc-arch.el: New file.
58 62
59 2004-03-12 Jesper Harder <harder@ifa.au.dk> 63 2004-03-12 Jesper Harder <harder@ifa.au.dk>
60 64
61 * info-look.el (info-lookup): Reuse an existing Info window. 65 * info-look.el (info-lookup): Reuse an existing Info window.
62 66
183 * find-dired.el (find-dired): Call `shell-command' instead of 187 * find-dired.el (find-dired): Call `shell-command' instead of
184 `start-process-shell-command'. By this, Tramp takes over 188 `start-process-shell-command'. By this, Tramp takes over
185 handling of remote directories. 189 handling of remote directories.
186 190
187 2004-03-07 Stefan Monnier <monnier@iro.umontreal.ca> 191 2004-03-07 Stefan Monnier <monnier@iro.umontreal.ca>
192
193 * newcomment.el (comment-use-global-state): New var.
194 (comment-search-forward): Use it.
195
196 * emacs-lisp/lisp-mode.el (lisp-mode-variables): Set it.
188 197
189 * cus-edit.el (fill) <defgroup>: Move to fill.el. 198 * cus-edit.el (fill) <defgroup>: Move to fill.el.
190 199
191 * textmodes/fill.el (fill) <defgroup>: Move from cus-edit.el. 200 * textmodes/fill.el (fill) <defgroup>: Move from cus-edit.el.
192 (enable-kinsoku): Make it a defcustom. 201 (enable-kinsoku): Make it a defcustom.