Commit 0d0358be authored by Karoly Lorentey's avatar Karoly Lorentey
Browse files

Merged from miles@gnu.org--gnu-2005 (patch 441-446)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-441
   Update reference to renamed Buffer-menu-buffer face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-442
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-443
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-444
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-445
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-446
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-354
parents f4d9bf3a b93e3c3b
......@@ -26,6 +26,9 @@ See msg from rms to emacs-devel on 21 Dec.
** Update Speedbar.
** Update vhdl-mode.el based on changes in
http://opensource.ethz.ch/emacs/vhdl-mode.html.
* FATAL ERRORS
......@@ -139,7 +142,7 @@ man/mark.texi "Luc Teirlinck" Chong Yidong
man/mini.texi "Luc Teirlinck" Chong Yidong
man/misc.texi Chong Yidong
man/msdog.texi Chong Yidong
man/mule.texi "Luc Teirlinck"
man/mule.texi "Luc Teirlinck" Kenichi Handa
man/m-x.texi "Luc Teirlinck" Chong Yidong
man/picture.texi Joakim Verona <joakim@verona.se> Chong Yidong
man/programs.texi "Stephen Eglen" Chong Yidong
......
......@@ -691,9 +691,9 @@ appears between the position information and the major mode.
*** New face `escape-glyph' highlights control characters and escape glyphs.
 
+++
*** Non-breaking space and hyphens are now prefixed with an escape
character, unless the new user variable `show-nonbreak-escape' is set
to nil.
*** Non-breaking space and hyphens are now displayed with a special
face, either nobreak-space or escape-glyph. You can turn this off or
specify a different mode by setting the variable `nobreak-char-display'.
 
+++
*** The parameters of automatic hscrolling can now be customized.
......@@ -3542,10 +3542,7 @@ accepts such a list for restoring the match state.
+++
*** Functions `match-data' and `set-match-data' now have an optional
argument `reseat'. When non-nil, all markers in the match data list
passed to these function will be reseated to point to nowhere, and if
the value of `reseat' is `evaporate', the markers are put onto the
free list. Note that no other references to those markers must exist
if `evaporate' is specified for the `reseat' argument.
passed to these function will be reseated to point to nowhere.
 
+++
*** The default value of `sentence-end' is now defined using the new
......
......@@ -30,6 +30,10 @@ to the FSF.
See also ESR's proposal for a BROWSER environment variable
<URL:http://www.catb.org/~esr/BROWSER/browse-url.patch>.
** Enhance scroll-bar to handle tall line (similar to line-move).
** Make occur handle multi-line matches cleanly with context.
* Important features:
** Provide user-friendly ways to list all available font families,
......
2005-06-24 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gud.el (gud-tooltip-print-command): Indent properly.
(gud-gdb-marker-filter): Use font-lock-warning-face for any
initial error.
* progmodes/gdb-ui.el (gdb-send): Remove warning face from errors
after fresh input.
(gdb-var-create-handler): Put name of expression in quotes.
2005-06-23 Luc Teirlinck <teirllm@auburn.edu>
* emacs-lisp/ring.el (ring-elements): Make it return a list of the
elements of RING in order, and without bogus nil elements.
2005-06-23 Richard M. Stallman <rms@gnu.org>
* simple.el (set-variable): Args renamed; doc fix.
(line-move-1): When there are overlays around, use vertical-motion.
* faces.el (escape-glyph): Use brown against light background.
(nobreak-space): Renamed from no-break-space.
Fix previous change.
* dired-aux.el (dired-do-copy): Fix arg prompt.
* mail/sendmail.el (mail-setup-with-from): Fix custom type.
2005-06-23 Glenn Morris <gmorris@ast.cam.ac.uk>
* mail/emacsbug.el (report-emacs-bug): Use "X server distributor"
rather than "Distributor".
2005-06-23 Lute Kamstra <lute@gnu.org>
* emacs-lisp/debug.el (debugger-special-form-p): New defun.
(debug-on-entry): Use it. New interactive declaration that uses
function-called-at-point.
2005-06-23 Kim F. Storm <storm@cua.dk>
* subr.el (save-match-data): Add comment about using evaporate arg
to set-match-data.
2005-06-22 Glenn Morris <gmorris@ast.cam.ac.uk>
* cus-edit.el (customize-face)
(customize-face-other-window): Handle face aliases.
* faces.el (face-documentation, set-face-attribute)
(face-spec-set): Handle face aliases.
2005-06-22 Juanma Barranquero <lekktu@gmail.com>
* help-mode.el (help-make-xrefs): If a symbol representing a face
name is not followed by the word "face", it could still be a
function or variable name, so don't bypass other checks.
2005-06-22 Juri Linkov <juri@jurta.org>
* ps-print.el (ps-face-foreground-name, ps-face-background-name):
Replace aliased functions with calls where second arg `inherit' is t.
2005-06-22 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-error): New variable.
(gdb-error): New function.
(gdb-annotation-rules): Act on error-begin and error annotations.
(gdb-concat-output): Use font-lock-warning-face for errors.
2005-06-22 Miles Bader <miles@gnu.org>
 
* bindings.el (propertized-buffer-identification): Use renamed
`Buffer-menu-buffer' face.
* faces.el (vertical-border): Renamed from `vertical-divider'.
(escape-glyph): Change dark-background color back to `cyan'.
 
......@@ -457,10 +530,9 @@
 
2005-06-15 Nick Roberts <nickrob@snap.net.nz>
 
* progmodes/gdb-ui.el (gdb-tooltip-print):
Respect tooltip-use-echo-area.
(menu): Re-order menu items.
* progmodes/gdb-ui.el (menu): Re-order menu items.
(gdb-tooltip-print): Respect tooltip-use-echo-area.
* progmodes/gud.el (tooltip-use-echo-area): Remove alias.
Define in tooltip.el.
(gud-tooltip-process-output): Respect tooltip-use-echo-area.
......@@ -580,7 +652,6 @@
variables, unless either `gtk' is boundp or this isn't a
`windows-nt' build.
 
>>>>>>> 1.7817
2005-06-13 Lute Kamstra <lute@gnu.org>
 
* abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and
......@@ -1488,7 +1559,6 @@
 
* simple.el (filter-buffer-substring): Fix typo in docstring.
 
>>>>>>> 1.7768
2005-05-31 Richard M. Stallman <rms@gnu.org>
 
* progmodes/vhdl-mode.el (vhdl-fill-region): Test ARG, not INTERACTIVE.
......@@ -1525,7 +1595,6 @@
* textmodes/tex-mode.el (tex-compile-commands, tex-compile)
(tex-start-tex): Undo all but the last part of the 2005-05-28 change.
 
>>>>>>> 1.7646
2005-05-30 Glenn Morris <gmorris@ast.cam.ac.uk>
 
* calendar/diary-lib.el (mark-included-diary-files): Only kill
......
......@@ -232,9 +232,13 @@ Note: The search is conducted only within 10%, at the beginning of the file."
(defvar change-log-font-lock-keywords
'(;;
;; Date lines, new and old styles.
("^\\sw.........[0-9:+ ]*"
(0 'change-log-date)
;; Date lines, new (2000-01-01) and old (Sat Jan 1 00:00:00 2000) styles.
;; Fixme: this regepx is just an approximate one and may match
;; wrongly with a non-date line existing as a random note. In
;; addition, using any kind of fixed setting like this doesn't
;; work if a user customizes add-log-time-format.
("^[0-9-]+ +\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+"
(0 'change-log-date-face)
;; Name and e-mail; some people put e-mail in parens, not angles.
("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil
(1 'change-log-name)
......
......@@ -471,7 +471,7 @@ Menu of mode operations in the mode line.")
FMT is a format specifier such as \"%12b\". This function adds
text properties for face, help-echo, and local-map to it."
(list (propertize fmt
'face 'Buffer-menu-buffer-face
'face 'Buffer-menu-buffer
'help-echo
(purecopy "mouse-1: previous buffer, mouse-3: next buffer")
'mouse-face 'mode-line-highlight
......
......@@ -1116,7 +1116,8 @@ version."
;;;###autoload
(defun customize-face (&optional face)
"Customize FACE, which should be a face name or nil.
If FACE is nil, customize all faces.
If FACE is nil, customize all faces. If FACE is actually a
face-alias, customize the face it is aliased to.
Interactively, when point is on text which has a face specified,
suggest to customize that face, if it's customizable."
......@@ -1133,6 +1134,9 @@ suggest to customize that face, if it's customizable."
face)
t nil)
"*Customize Faces*")
;; If FACE is actually an alias, customize the face it is aliased to.
(if (get face 'face-alias)
(setq face (get face 'face-alias)))
(unless (facep face)
(error "Invalid face %S" face))
(custom-buffer-create (list (list face 'custom-face))
......@@ -1142,6 +1146,7 @@ suggest to customize that face, if it's customizable."
;;;###autoload
(defun customize-face-other-window (&optional face)
"Show customization buffer for face FACE in other window.
If FACE is actually a face-alias, customize the face it is aliased to.
Interactively, when point is on text which has a face specified,
suggest to customize that face, if it's customizable."
......@@ -1159,6 +1164,8 @@ suggest to customize that face, if it's customizable."
face)
t nil)
"*Customize Faces*")
(if (get face 'face-alias)
(setq face (get face 'face-alias)))
(unless (facep face)
(error "Invalid face %S" face))
(custom-buffer-create-other-window
......
......@@ -1509,7 +1509,7 @@ suggested for the target directory depends on the value of
(interactive "P")
(let ((dired-recursive-copies dired-recursive-copies))
(dired-do-create-files 'copy (function dired-copy-file)
(if dired-copy-preserve-time "Copy [-p]" "Copy")
"Copy"
arg dired-keep-marker-copy
nil dired-copy-how-to-fn)))
......
......@@ -653,6 +653,12 @@ functions to break on entry."
nil
(funcall debugger 'debug)))
(defun debugger-special-form-p (symbol)
"Return whether SYMBOL is a special form."
(and (fboundp symbol)
(subrp (symbol-function symbol))
(eq (cdr (subr-arity (symbol-function symbol))) 'unevalled)))
;;;###autoload
(defun debug-on-entry (function)
"Request FUNCTION to invoke debugger each time it is called.
......@@ -668,9 +674,21 @@ primitive functions only works when that function is called from Lisp.
Use \\[cancel-debug-on-entry] to cancel the effect of this command.
Redefining FUNCTION also cancels it."
(interactive "aDebug on entry (to function): ")
(when (and (subrp (symbol-function function))
(eq (cdr (subr-arity (symbol-function function))) 'unevalled))
(interactive
(let ((fn (function-called-at-point)) val)
(when (debugger-special-form-p fn)
(setq fn nil))
(setq val (completing-read
(if fn
(format "Debug on entry to function (default %s): " fn)
"Debug on entry to function: ")
obarray
#'(lambda (symbol)
(and (fboundp symbol)
(not (debugger-special-form-p symbol))))
t nil nil (symbol-name fn)))
(list (if (equal val "") fn (intern val)))))
(when (debugger-special-form-p function)
(error "Function %s is a special form" function))
(if (or (symbolp (symbol-function function))
(subrp (symbol-function function)))
......
......@@ -155,8 +155,13 @@ will be performed."
(aref vec (ring-index index hd ln (length vec))))))
(defun ring-elements (ring)
"Return a list of the elements of RING."
(mapcar #'identity (cddr ring)))
"Return a list of the elements of RING, in order, newest first."
(let ((start (car ring))
(size (ring-size ring))
(vect (cddr ring))
lst)
(dotimes (var (cadr ring) lst)
(push (aref vect (mod (+ start var) size)) lst))))
;;; provide ourself:
......
......@@ -513,8 +513,17 @@ Use `face-attribute' for finer control."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun face-documentation (face)
"Get the documentation string for FACE."
(get face 'face-documentation))
"Get the documentation string for FACE.
If FACE is a face-alias, get the documentation for the target face."
(let ((alias (get face 'face-alias))
doc)
(if alias
(progn
(setq doc (get alias 'face-documentation))
(format "%s is an alias for the face `%s'.%s" face alias
(if doc (format "\n%s" doc)
"")))
(get face 'face-documentation))))
(defun set-face-documentation (face string)
......@@ -661,7 +670,7 @@ like an underlying face would be, with higher priority than underlying faces."
(setq args (purecopy args))
;; If we set the new-frame defaults, this face is modified outside Custom.
(if (memq where '(0 t))
(put face 'face-modified t))
(put (or (get face 'face-alias) face) 'face-modified t))
(while args
(internal-set-lisp-face-attribute face (car args)
(purecopy (cadr args))
......@@ -1443,7 +1452,7 @@ If SPEC is nil, do nothing."
;; When we reset the face based on its spec, then it is unmodified
;; as far as Custom is concerned.
(if (null frame)
(put face 'face-modified nil)))
(put (or (get face 'face-alias) face) 'face-modified nil)))
(defun face-attr-match-p (face attrs &optional frame)
......@@ -2141,17 +2150,18 @@ Note: Other faces cannot inherit from the cursor face."
;; See the comment in minibuffer-prompt for
;; the reason not to use blue on MS-DOS.
(((type pc)) :foreground "magenta")
;; red4 is too light -- rms.
(t :foreground "blue"))
;; red4 is too dark, but some say blue is too loud.
;; brown seems to work ok. -- rms.
(t :foreground "brown"))
"Face for characters displayed as ^-sequences or \-sequences."
:group 'basic-faces
:version "22.1")
(defface no-break-space
(defface nobreak-space
'((((class color) (min-colors 88)) :inherit escape-glyph :underline t)
(((class color) (min-colors 8)) :background "magenta" :foreground )
(((class color) (min-colors 8)) :background "magenta")
(t :inverse-video t))
"Face for non-breaking space."
"Face for displaying nobreak space."
:group 'basic-faces
:version "22.1")
......
2005-06-23 Lute Kamstra <lute@gnu.org>
* gnus-art.el (gnus-article-mode): Use kill-all-local-variables.
* dig.el (dig-mode):
* smime.el (smime-mode): Use gnus-run-mode-hooks.
2005-06-21 Juanma Barranquero <lekktu@gmail.com>
* nnimap.el (nnimap-split-download-body): Fix spellings.
......
......@@ -148,7 +148,8 @@ Buffer should contain output generated by `dig-invoke'."
(set (make-local-variable 'font-lock-defaults)
'(dig-font-lock-keywords t)))
(when (featurep 'font-lock)
(font-lock-set-defaults)))
(font-lock-set-defaults))
(gnus-run-mode-hooks 'dig-mode-hook))
(defun dig-exit ()
"Quit dig output buffer."
......
......@@ -3732,6 +3732,7 @@ commands:
\\[gnus-article-describe-briefly]\t Describe the current mode briefly
\\[gnus-info-find-node]\t Go to the Gnus info node"
(interactive)
(kill-all-local-variables)
(gnus-simplify-mode-line)
(setq mode-name "Article")
(setq major-mode 'gnus-article-mode)
......
......@@ -596,7 +596,8 @@ The following commands are available:
(use-local-map smime-mode-map)
(buffer-disable-undo)
(setq truncate-lines t)
(setq buffer-read-only t))
(setq buffer-read-only t)
(gnus-run-mode-hooks 'smime-mode-hook))
(defun smime-certificate-info (certfile)
(interactive "fCertificate file: ")
......
......@@ -388,9 +388,10 @@ that."
;;; (pop-to-buffer (car location))
;;; (goto-char (cdr location))))
(help-xref-button 8 'help-function-def sym))
((facep sym)
(if (save-match-data (looking-at "[ \t\n]+face\\W"))
(help-xref-button 8 'help-face sym)))
((and
(facep sym)
(save-match-data (looking-at "[ \t\n]+face\\W")))
(help-xref-button 8 'help-face sym))
((and (boundp sym) (fboundp sym))
;; We can't intuit whether to use the
;; variable or function doc -- supply both.
......
......@@ -130,7 +130,7 @@ usually do not have translators to read other languages for them.\n\n")
(insert "In " (emacs-version) "\n")
(if (fboundp 'x-server-vendor)
(condition-case nil
(insert "Distributor `" (x-server-vendor) "', version "
(insert "X server distributor `" (x-server-vendor) "', version "
(mapconcat 'number-to-string (x-server-version) ".") "\n")
(error t)))
(if (and system-configuration-options
......
......@@ -44,7 +44,7 @@
(defcustom mail-setup-with-from t
"Non-nil means insert `From:' field when setting up the message."
:type 'binary
:type 'boolean
:group 'sendmail
:version "22.1")
......
......@@ -85,6 +85,7 @@
(defvar gdb-find-file-unhook nil)
(defvar gdb-active-process nil "GUD tooltips display variable values when t, \
and #define directives otherwise.")
(defvar gdb-error "Non-nil when GDB is reporting an error.")
(defvar gdb-macro-info nil
"Non-nil if GDB knows that the inferior includes preprocessor macro info.")
......@@ -359,6 +360,7 @@ Also display the main routine in the disassembly buffer if present."
gdb-flush-pending-output nil
gdb-location-alist nil
gdb-find-file-unhook nil
gdb-error nil
gdb-macro-info nil)
;;
(setq gdb-buffer-type 'gdba)
......@@ -430,7 +432,7 @@ Also display the main routine in the disassembly buffer if present."
(setq gdb-var-changed t)))
(if (re-search-forward "Undefined command" nil t)
(message-box "Watching expressions requires gdb 6.0 onwards")
(message "No symbol %s in current context." expr)))))
(message "No symbol \"%s\" in current context." expr)))))
(defun gdb-var-evaluate-expression-handler (varnum changed)
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
......@@ -774,6 +776,8 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
(defun gdb-send (proc string)
"A comint send filter for gdb.
This filter may simply queue input for a later time."
(with-current-buffer gud-comint-buffer
(remove-text-properties (point-min) (point-max) '(face)))
(let ((item (concat string "\n")))
(if gud-running
(progn
......@@ -860,6 +864,8 @@ This filter may simply queue input for a later time."
("watchpoint" gdb-stopping)
("frame-begin" gdb-frame-begin)
("stopped" gdb-stopped)
("error-begin" gdb-error)
("error" gdb-error)
) "An assoc mapping annotation tags to functions which process them.")
(defun gdb-resync()
......@@ -989,6 +995,9 @@ sink to `user' in `gdb-stopping', that is fine."
(gdb-resync)
(error "Unexpected stopped annotation")))))
(defun gdb-error (ignored)
(setq gdb-error (not gdb-error)))
(defun gdb-post-prompt (ignored)
"An annotation handler for `post-prompt'.
This begins the collection of output from the current command if that
......@@ -1083,6 +1092,8 @@ happens to be appropriate."
output)))
(defun gdb-concat-output (so-far new)
(if gdb-error
(put-text-property 0 (length new) 'face font-lock-warning-face new))
(let ((sink gdb-output-sink))
(cond
((eq sink 'user) (concat so-far new))
......
......@@ -497,18 +497,24 @@ off the specialized speedbar mode."
;; Check for annotations and change gud-minor-mode to 'gdba if
;; they are found.
(while (string-match "\n\032\032\\(.*\\)\n" gud-marker-acc)
(when (string-equal (match-string 1 gud-marker-acc) "prompt")
(require 'gdb-ui)
(gdb-prompt nil))
(setq
;; Append any text before the marker to the output we're going
;; to return - we don't include the marker in this text.
output (concat output
(substring gud-marker-acc 0 (match-beginning 0)))
;; Set the accumulator to the remaining text.
gud-marker-acc (substring gud-marker-acc (match-end 0))))
(let ((match (match-string 1 gud-marker-acc)))
(when (string-equal match "prompt")
(require 'gdb-ui)
(gdb-prompt nil))
(setq
;; Append any text before the marker to the output we're going
;; to return - we don't include the marker in this text.
output (concat output
(substring gud-marker-acc 0 (match-beginning 0)))
;; Set the accumulator to the remaining text.
gud-marker-acc (substring gud-marker-acc (match-end 0)))
(if (string-equal match "error-begin")
(put-text-property 0 (length gud-marker-acc)
'face font-lock-warning-face
gud-marker-acc))))
;; Does the remaining text look like it might end with the
;; beginning of another marker? If it does, then keep it in
......@@ -3256,11 +3262,11 @@ If GUD-TOOLTIP-DEREFERENCE is t, also prepend a `*' to EXPR."
(when gud-tooltip-dereference
(setq expr (concat "*" expr)))
(case gud-minor-mode
(gdba (concat "server print " expr))
((dbx gdbmi) (concat "print " expr))
(xdb (concat "p " expr))
(sdb (concat expr "/"))
(perldb expr)))
(gdba (concat "server print " expr))
((dbx gdbmi) (concat "print " expr))
(xdb (concat "p " expr))
(sdb (concat expr "/"))
(perldb expr)))
(defun gud-tooltip-tips (event)
"Show tip for identifier or selection under the mouse.
......
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