diff lisp/ChangeLog @ 83078:fac24544c283

Merged in changes from CVS HEAD Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-146 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-147 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-148 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-149 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-150 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-151 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-152 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-153 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-154 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-155 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-156 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-157 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-158 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-118

--- a/lisp/ChangeLog	Thu Mar 11 02:31:12 2004 +0000
+++ b/lisp/ChangeLog	Tue Mar 16 20:27:22 2004 +0000
@@ -1,3 +1,176 @@
[phone]  Masatake YAMATO  <[e-mail]>
+
+	Added context menu support in smerge mode.
+	Most of the part is written by Stefan Monnier.
+
+	* smerge-mode.el (smerge-context-menu-map, smerge-context-menu):
+	New keymap and menu.
+	(smerge-text-properties): New function.
+	(smerge-remove-props): New function.
+	(smerge-popup-context-menu): New function.
+	(smerge-resolve): Call `smerge-remove-props'.
+	(smerge-keep-base, smerge-keep-other, smerge-keep-mine): Ditto.
+	(smerge-keep-current): Ditto.
+	(smerge-kill-current): New function.
+	(smerge-match-conflict): Put text properties.
+	Detect the file as `same-diff conflict' if the filename is "ANCESTOR".
+
[phone]  David Ponce  <[e-mail]>
+
+	* ruler-mode.el: (ruler-mode-left-fringe-cols)
+	(ruler-mode-right-fringe-cols, ruler-mode-left-scroll-bar-cols)
+	(ruler-mode-right-scroll-bar-cols): Remove.
+	(ruler-mode-window-col, ruler-mode-mouse-set-left-margin)
+	(ruler-mode-mouse-set-right-margin, ruler-mode-ruler):
+	Use fringe-columns and scroll-bar-columns.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* hl-line.el (hl-line-range-function): New variable.
+	(hl-line-move): New function.
+	(global-hl-line-highlight): Use `hl-line-move'.
+	(hl-line-highlight): Ditto.
+
+	* scroll-bar.el (scroll-bar-columns):
+	* fringe.el (fringe-columns): New function derived from ruler-mode.el.
+
+	* ruler-mode.el (top-level): Require scroll-bar and fringe.
+	(ruler-mode-left-fringe-cols)
+	(ruler-mode-right-fringe-cols): Use `fringe-columns'.
+	(ruler-mode-right-scroll-bar-cols)
+	(ruler-mode-left-scroll-bar-cols): Use `scroll-bar-columns'.
+	(ruler-mode-ruler-function): New variable.
+	(ruler-mode-header-line-format): Call `ruler-mode-ruler-function'
+	if the value for `ruler-mode-ruler-function'is given.
+
+	* hexl.el (hexl-mode-hook): Make the hook customizable.
+	(hexl-address-area, hexl-ascii-area): New customize variables.
+	(hexlify-buffer): Put font-lock-faces on the address area and
+	the ascii area.
+	(hexl-activate-ruler): New function.
+	(hexl-follow-line): New function.
+	(hexl-highlight-line-range): New function.
+	(hexl-mode-ruler): New function.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* vc-hooks.el (vc-handled-backends): Add Arch.  Move MCVS down.
+	(vc-default-find-file-hook): New fun.
+	(vc-find-file-hook): Call new find-file-hook operation.
+
+	* vc-arch.el: New file.
+
[phone]  Jesper Harder  <[e-mail]>
+
+	* info-look.el (info-lookup): Reuse an existing Info window.
+
[phone]  Francis J. Wright  <[e-mail]>
+
+	* woman.el (woman-preserve-ascii): Default value changed to t and
+	doc string revised.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* pcvs.el (cvs-mode-add-change-log-entry-other-window):
+	Fix minor bug.
+
+	* replace.el (occur-engine): Change message for count of matches.
+
+	* emacs-lisp/bytecomp.el (byte-compile-get-constant):
+	For strings, do compare text properties.
+
[phone]  Daniel Pfeiffer  <[e-mail]>
+
+	* progmodes/compile.el (compile-auto-highlight)
+	(compilation-error-list, compilation-old-error-list)
+	(compilation-parse-errors-function, compilation-parsing-end)
+	(compilation-error-message, compilation-directory-stack)
+	(compilation-enter-directory-regexp-alist)
+	(compilation-leave-directory-regexp-alist)
+	(compilation-file-regexp-alist, compilation-nomessage-regexp-alist)
+	(compilation-current-file, compilation-regexps): Remove vars.
+
+	(compile-error-at-point, compilation-error-filedata)
+	(compilation-error-filedata-file-name, compile-reinitialize-errors)
+	(compilation-next-error-locus, compilation-forget-errors)
+	(count-regexp-groupings, compilation-parse-errors)
+	(compile-collect-regexps, compile-buffer-substring): Remove funs.
+
+	(compile-internal): Make obsolete.
+
+	(compilation-first-column, compilation-error)
+	(compilation-directory-matcher, compilation-page-delimiter)
+	(compilation-mode-font-lock-keywords, compilation-debug)
+	(compilation-error-face, compilation-warning-face)
+	(compilation-info-face, compilation-line-face)
+	(compilation-column-face, compilation-enter-directory-face)
+	(compilation-leave-directory-face, compilation-skip-threshold)
+	(compilation-skip-visited, compilation-context-lines): New vars.
+
+	(compilation-warning-face, compilation-info-face)
+	(compilation-message-face): New faces.
+
+	(compilation-error-regexp-alist-alist): New constant.
+
+	(compilation-face, compilation-directory-properties)
+	(compilation-assq, compilation-error-properties, compilation-start)
+	(define-compilation-mode, compilation-loop)
+	(compilation-set-window): New functions.
+
+	(compile): Additional argument for interactive compiles like TeX.
+
+	* progmodes/grep.el (kill-grep): Move here from compile.el
+	(grep-error, grep-hit-face, grep-error-face)
+	(grep-mode-font-lock-keywords): New variables.
+	(grep-regexp-alist): Simplify regexp and add `binary' case.
+	(grep-mode): New mode.
+	(grep-process-setup): Simplify.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* net/ldap.el (ldap-search-internal): Handle file URLs with drive
+	letters on DOS/Windows.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* server.el (server-name): New var.
+	(server-socket-dir): New var to replace server-socket-name.
+	(server-start): Use them.
+
[phone]  Simon Josefsson  <[e-mail]>
+
+	* mail/smtpmail.el (smtpmail-read-response): Abort if process has
+	died to avoid infloop.  Reported by Jonathan Glauner
+	<[e-mail]>.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* smerge-mode.el (smerge-check-cache, smerge-check): New var and fun.
+	(smerge-mode-menu): Use it to deactivate menu entries.
+	(smerge-keep-current): New fun.
+	(smerge-keep-current): Use it.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* foldout.el (foldout-fold-list, foldout-modeline-string):
+	Declare them as variables, not constants.
+
[phone]  Vinicius Jose Latorre  <[e-mail]>
+
+	* ps-print.el: Modification to print *Messages* buffer.
+	(ps-print-version): New version 6.6.4.
+	(ps-message-log-max): New fun.
+	(ps-spool-without-faces, ps-spool-with-faces)
+	(ps-count-lines-preprint): Code fix.
+
+	* printing.el: New tips in Tips section.
+
[phone]  Vinicius Jose Latorre  <[e-mail]>
+
+	* delim-col.el: Doc fix.
+
+	* printing.el: Doc fix.  New doc section (Tips).
+
 2004-03-09  Stefan Monnier  <[e-mail]>
 
 	* type-break.el (type-break-emacs-variant): Remove.
@@ -17,6 +190,11 @@
 
 2004-03-07  Stefan Monnier  <[e-mail]>
 
+	* newcomment.el (comment-use-global-state): New var.
+	(comment-search-forward): Use it.
+
+	* emacs-lisp/lisp-mode.el (lisp-mode-variables): Set it.
+
 	* cus-edit.el (fill) <defgroup>: Move to fill.el.
 
 	* textmodes/fill.el (fill) <defgroup>: Move from cus-edit.el.