Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100644. ------------------------------------------------------------ revno: 100644 committer: Chong Yidong branch nick: trunk timestamp: Fri 2010-06-25 15:32:37 -0400 message: Revert last change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-25 19:24:05 +0000 +++ lisp/ChangeLog 2010-06-25 19:32:37 +0000 @@ -1,9 +1,3 @@ -2010-06-25 Chong Yidong - - * frame.el (initial-frame-alist): Give default value entries for - menu-bar-lines and tool-bar-lines consistent with the startup - default (Bug#2249). - 2010-06-25 Agustín Martín * flyspell.el (flyspell-check-previous-highlighted-word): Make === modified file 'lisp/frame.el' --- lisp/frame.el 2010-06-25 19:24:05 +0000 +++ lisp/frame.el 2010-06-25 19:32:37 +0000 @@ -52,8 +52,7 @@ ;; The initial value given here used to ask for a minibuffer. ;; But that's not necessary, because the default is to have one. ;; By not specifying it here, we let an X resource specify it. -(defcustom initial-frame-alist - '((menu-bar-lines . 1) (tool-bar-lines . 1)) +(defcustom initial-frame-alist nil "Alist of parameters for the initial X window frame. You can set this in your init file; for example, === modified file 'src/ChangeLog' --- src/ChangeLog 2010-06-25 19:24:05 +0000 +++ src/ChangeLog 2010-06-25 19:32:37 +0000 @@ -1,9 +1,3 @@ -2010-06-25 Chong Yidong - - * frame.c (Vdefault_frame_alist): Give default value entries for - menu-bar-lines and tool-bar-lines consistent with the startup - default (Bug#2249). - 2010-06-24 Juanma Barranquero * gtkutil.c (xg_update_scrollbar_pos): === modified file 'src/frame.c' --- src/frame.c 2010-06-25 19:24:05 +0000 +++ src/frame.c 2010-06-25 19:32:37 +0000 @@ -4595,8 +4595,7 @@ The `menu-bar-lines' element of the list controls whether new frames have menu bars; `menu-bar-mode' works by altering this element. Setting this variable does not affect existing frames, only new ones. */); - Vdefault_frame_alist = list2 (Fcons (Qmenu_bar_lines, make_number (1)), - Fcons (Qtool_bar_lines, make_number (1))); + Vdefault_frame_alist = Qnil; DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars, doc: /* Default position of scroll bars on this window-system. */); ------------------------------------------------------------ revno: 100643 committer: Chong Yidong branch nick: trunk timestamp: Fri 2010-06-25 15:24:05 -0400 message: Change initial-frame-alist and default-frame-alist defaults (Bug#2249). Since the menu-bar and tool-bar are now unconditionally turned on by default, we can let the defcustom defaults reflect that. * frame.el (initial-frame-alist): Give default value entries for menu-bar-lines and tool-bar-lines consistent with the startup default (Bug#2249). * frame.c (Vdefault_frame_alist): Give default value entries for menu-bar-lines and tool-bar-lines consistent with the startup default (Bug#2249). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-25 08:31:50 +0000 +++ lisp/ChangeLog 2010-06-25 19:24:05 +0000 @@ -1,3 +1,9 @@ +2010-06-25 Chong Yidong + + * frame.el (initial-frame-alist): Give default value entries for + menu-bar-lines and tool-bar-lines consistent with the startup + default (Bug#2249). + 2010-06-25 Agustín Martín * flyspell.el (flyspell-check-previous-highlighted-word): Make === modified file 'lisp/frame.el' --- lisp/frame.el 2010-05-05 02:08:25 +0000 +++ lisp/frame.el 2010-06-25 19:24:05 +0000 @@ -52,7 +52,8 @@ ;; The initial value given here used to ask for a minibuffer. ;; But that's not necessary, because the default is to have one. ;; By not specifying it here, we let an X resource specify it. -(defcustom initial-frame-alist nil +(defcustom initial-frame-alist + '((menu-bar-lines . 1) (tool-bar-lines . 1)) "Alist of parameters for the initial X window frame. You can set this in your init file; for example, === modified file 'src/ChangeLog' --- src/ChangeLog 2010-06-24 16:08:22 +0000 +++ src/ChangeLog 2010-06-25 19:24:05 +0000 @@ -1,3 +1,9 @@ +2010-06-25 Chong Yidong + + * frame.c (Vdefault_frame_alist): Give default value entries for + menu-bar-lines and tool-bar-lines consistent with the startup + default (Bug#2249). + 2010-06-24 Juanma Barranquero * gtkutil.c (xg_update_scrollbar_pos): === modified file 'src/frame.c' --- src/frame.c 2010-04-20 01:50:52 +0000 +++ src/frame.c 2010-06-25 19:24:05 +0000 @@ -4595,7 +4595,8 @@ The `menu-bar-lines' element of the list controls whether new frames have menu bars; `menu-bar-mode' works by altering this element. Setting this variable does not affect existing frames, only new ones. */); - Vdefault_frame_alist = Qnil; + Vdefault_frame_alist = list2 (Fcons (Qmenu_bar_lines, make_number (1)), + Fcons (Qtool_bar_lines, make_number (1))); DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars, doc: /* Default position of scroll bars on this window-system. */); ------------------------------------------------------------ revno: 100642 committer: Agustin martin branch nick: trunk timestamp: Fri 2010-06-25 10:31:50 +0200 message: Add missing Changelog entries for textmodes/ispell.el (bzr#100641) and textmodes/flyspell.el (bzr#100640) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-24 21:51:14 +0000 +++ lisp/ChangeLog 2010-06-25 08:31:50 +0000 @@ -1,3 +1,11 @@ +2010-06-25 Agustín Martín + + * flyspell.el (flyspell-check-previous-highlighted-word): Make + sure `flyspell-word' re-checks word after function run (Bug#6504). + + * ispell.el (ispell-init-process): Make sure ispell and default + directories are expanded. (Bug#6143). + 2010-06-24 Juri Linkov * minibuffer.el (completions-format): Change default from nil to ------------------------------------------------------------ revno: 100641 committer: Agustin martin branch nick: trunk timestamp: Fri 2010-06-25 10:28:01 +0200 message: ispell.el (ispell-init-process): Make sure ispell and default directories are expanded. diff: === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2010-06-17 14:44:34 +0000 +++ lisp/textmodes/ispell.el 2010-06-25 08:28:01 +0000 @@ -2622,7 +2622,7 @@ ;; Restart check for personal dictionary is done in ;; `ispell-internal-change-dictionary', called from `ispell-buffer-local-dict' (or (or ispell-local-pdict ispell-personal-dictionary) - (equal ispell-process-directory default-directory))) + (equal ispell-process-directory (expand-file-name default-directory)))) (setq ispell-filter nil ispell-filter-continue nil) ;; may need to restart to select new personal dictionary. (ispell-kill-ispell t) @@ -2638,13 +2638,13 @@ (if (window-minibuffer-p) (if (fboundp 'minibuffer-selected-window) ;; Assign ispell process to parent buffer - (setq ispell-process-directory default-directory + (setq ispell-process-directory (expand-file-name default-directory) ispell-process-buffer-name (window-buffer (minibuffer-selected-window))) ;; Force `ispell-process-directory' to $HOME and use a dummy name (setq ispell-process-directory (expand-file-name "~/") ispell-process-buffer-name " * Minibuffer-has-spellcheck-enabled")) ;; Not in a minibuffer - (setq ispell-process-directory default-directory + (setq ispell-process-directory (expand-file-name default-directory) ispell-process-buffer-name (buffer-name))) (if ispell-async-processp (set-process-filter ispell-process 'ispell-filter)) ------------------------------------------------------------ revno: 100640 committer: Agustin martin branch nick: trunk timestamp: Fri 2010-06-25 10:19:11 +0200 message: Make sure `flyspell-word' checks word after (flyspell-check-previous-highlighted-word) run. diff: === modified file 'lisp/textmodes/flyspell.el' --- lisp/textmodes/flyspell.el 2010-03-23 02:37:11 +0000 +++ lisp/textmodes/flyspell.el 2010-06-25 08:19:11 +0000 @@ -1817,7 +1817,9 @@ (throw 'exit t))))))) (save-excursion (goto-char pos) - (ispell-word)) + (ispell-word) + (setq flyspell-word-cache-word nil) ;; Force flyspell-word re-check + (flyspell-word)) (error "No word to correct before point")))) ;;*---------------------------------------------------------------------*/ ------------------------------------------------------------ revno: 100639 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-06-24 20:33:25 -0400 message: Add redisplay test for image and overlay string interaction. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2010-06-11 14:39:54 +0000 +++ test/ChangeLog 2010-06-25 00:33:25 +0000 @@ -1,3 +1,7 @@ +2010-06-25 Chong Yidong + + * redisplay-testsuite.el (test-redisplay-3): New test. + 2010-06-11 Chong Yidong * comint-testsuite.el: New file. === modified file 'test/redisplay-testsuite.el' --- test/redisplay-testsuite.el 2010-01-13 08:35:10 +0000 +++ test/redisplay-testsuite.el 2010-06-25 00:33:25 +0000 @@ -110,13 +110,72 @@ (propertize "XXX\n" 'face 'highlight) "\n Test: ") (test-insert-overlay "XXX\n" 'mouse-face 'highlight) - (insert "\n")) + (insert "\n\n")) + +(defun test-redisplay-3 () + (insert "Test 3: Overlay with before/after strings and images:\n\n") + (let ((img-data "#define x_width 8 +#define x_height 8 +static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 0xa5, 0xbd, 0x81, 0xff };")) + ;; Control + (insert " Expected: AB" + (propertize "X" 'display `(image :data ,img-data :type xbm)) + "CD\n") + + ;; Overlay with before, after, and image display string. + (insert " Result 1: ") + (let ((opoint (point))) + (insert "AXD\n") + (let ((ov (make-overlay (1+ opoint) (+ 2 opoint)))) + (overlay-put ov 'before-string "B") + (overlay-put ov 'after-string "C") + (overlay-put ov 'display + `(image :data ,img-data :type xbm)))) + + ;; Overlay with before and after string, and image text prop. + (insert " Result 2: ") + (let ((opoint (point))) + (insert "AXD\n") + (let ((ov (make-overlay (1+ opoint) (+ 2 opoint)))) + (overlay-put ov 'before-string "B") + (overlay-put ov 'after-string "C") + (put-text-property (1+ opoint) (+ 2 opoint) 'display + `(image :data ,img-data :type xbm)))) + + ;; Overlays with adjacent before and after strings, and image text + ;; prop. + (insert " Result 3: ") + (let ((opoint (point))) + (insert "AXD\n") + (let ((ov1 (make-overlay opoint (1+ opoint))) + (ov2 (make-overlay (+ 2 opoint) (+ 3 opoint)))) + (overlay-put ov1 'after-string "B") + (overlay-put ov2 'before-string "C") + (put-text-property (1+ opoint) (+ 2 opoint) 'display + `(image :data ,img-data :type xbm)))) + + ;; Three overlays. + (insert " Result 4: ") + (let ((opoint (point))) + (insert "AXD\n\n") + (let ((ov1 (make-overlay opoint (1+ opoint))) + (ov2 (make-overlay (+ 2 opoint) (+ 3 opoint))) + (ov3 (make-overlay (1+ opoint) (+ 2 opoint)))) + (overlay-put ov1 'after-string "B") + (overlay-put ov2 'before-string "C") + (overlay-put ov3 'display `(image :data ,img-data :type xbm)))))) + (defun test-redisplay () (interactive) - (pop-to-buffer (generate-new-buffer "*Redisplay Test*")) - (test-redisplay-1) - (test-redisplay-2) - (goto-char (point-min))) + (let ((buf (get-buffer "*Redisplay Test*"))) + (if buf + (kill-buffer buf)) + (pop-to-buffer (get-buffer-create "*Redisplay Test*")) + (erase-buffer) + (test-redisplay-1) + (test-redisplay-2) + (test-redisplay-3) + (goto-char (point-min)))) ;; arch-tag: fcee53c8-024f-403d-9154-61ae3ce0bfb8 ------------------------------------------------------------ revno: 100638 committer: Juri Linkov branch nick: trunk timestamp: Fri 2010-06-25 00:51:14 +0300 message: * lisp/minibuffer.el (completions-format): Change default from nil to `horizontal'. Remove `nil' value from :type. Doc fix. (Bug#6459) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-24 21:38:07 +0000 +++ lisp/ChangeLog 2010-06-24 21:51:14 +0000 @@ -1,5 +1,10 @@ 2010-06-24 Juri Linkov + * minibuffer.el (completions-format): Change default from nil to + `horizontal'. Remove `nil' value from :type. Doc fix. (Bug#6459) + +2010-06-24 Juri Linkov + * vc/vc.el (vc-diff-internal): Set `revert-buffer-function' buffer-locally to lambda that re-runs the vc diff command. (Bug#6447) === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2010-05-30 14:17:31 +0000 +++ lisp/minibuffer.el 2010-06-24 21:51:14 +0000 @@ -891,13 +891,13 @@ (defface completions-annotations '((t :inherit italic)) "Face to use for annotations in the *Completions* buffer.") -(defcustom completions-format nil +(defcustom completions-format 'horizontal "Define the appearance and sorting of completions. If the value is `vertical', display completions sorted vertically in columns in the *Completions* buffer. -If the value is `horizontal' or nil, display completions sorted +If the value is `horizontal', display completions sorted horizontally in alphabetical order, rather than down the screen." - :type '(choice (const nil) (const horizontal) (const vertical)) + :type '(choice (const horizontal) (const vertical)) :group 'minibuffer :version "23.2") ------------------------------------------------------------ revno: 100637 committer: Juri Linkov branch nick: trunk timestamp: Fri 2010-06-25 00:38:07 +0300 message: * lisp/vc/vc.el (vc-diff-internal): Set `revert-buffer-function' buffer-locally to lambda that re-runs the vc diff command. (Bug#6447) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-24 19:16:33 +0000 +++ lisp/ChangeLog 2010-06-24 21:38:07 +0000 @@ -1,3 +1,9 @@ +2010-06-24 Juri Linkov + + * vc/vc.el (vc-diff-internal): Set `revert-buffer-function' + buffer-locally to lambda that re-runs the vc diff command. + (Bug#6447) + 2010-06-24 Chong Yidong * kmacro.el (kmacro-call-macro): Don't issue hint message if the === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2010-06-11 19:09:57 +0000 +++ lisp/vc/vc.el 2010-06-24 21:38:07 +0000 @@ -1547,6 +1547,9 @@ (message "%s" (cdr messages)) nil) (diff-mode) + (set (make-local-variable 'revert-buffer-function) + `(lambda (ignore-auto noconfirm) + (vc-diff-internal ,async ',vc-fileset ,rev1 ,rev2 ,verbose))) ;; Make the *vc-diff* buffer read only, the diff-mode key ;; bindings are nicer for read only buffers. pcl-cvs does the ;; same thing. ------------------------------------------------------------ revno: 100636 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-06-24 15:16:33 -0400 message: Don't issue kmacro hint if echo area is in use (Bug#3412). * lisp/kmacro.el (kmacro-call-macro): Don't issue hint message if the echo area is in use (Bug#3412). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-22 08:10:26 +0000 +++ lisp/ChangeLog 2010-06-24 19:16:33 +0000 @@ -1,3 +1,8 @@ +2010-06-24 Chong Yidong + + * kmacro.el (kmacro-call-macro): Don't issue hint message if the + echo area is in use (Bug#3412). + 2010-06-22 Glenn Morris * textmodes/texinfmt.el (texinfo-format-region) === modified file 'lisp/kmacro.el' --- lisp/kmacro.el 2010-01-13 08:35:10 +0000 +++ lisp/kmacro.el 2010-06-24 19:16:33 +0000 @@ -642,11 +642,13 @@ kmacro-call-repeat-key))) (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil)) (while repeat-key - (message "(Type %s to repeat macro%s)" - repeat-key-str - (if (and kmacro-call-repeat-with-arg - arg (> arg 1)) - (format " %d times" arg) "")) + ;; Issue a hint to the user, if the echo area isn't in use. + (unless (current-message) + (message "(Type %s to repeat macro%s)" + repeat-key-str + (if (and kmacro-call-repeat-with-arg + arg (> arg 1)) + (format " %d times" arg) ""))) (if (equal repeat-key (read-event)) (progn (clear-this-command-keys t) ------------------------------------------------------------ revno: 100635 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2010-06-24 18:12:35 +0200 message: lib-src/movemail.c (error): Avoid warning when there are no args. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-06-11 21:26:13 +0000 +++ lib-src/ChangeLog 2010-06-24 16:12:35 +0000 @@ -1,3 +1,7 @@ +2010-06-24 Juanma Barranquero + + * movemail.c (error): Avoid warning when there are no args. + 2010-06-11 Juanma Barranquero * makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc === modified file 'lib-src/movemail.c' --- lib-src/movemail.c 2010-04-03 01:54:24 +0000 +++ lib-src/movemail.c 2010-06-24 16:12:35 +0000 @@ -612,7 +612,7 @@ else if (s2) fprintf (stderr, s1, s2); else - fprintf (stderr, s1); + fprintf (stderr, "%s", s1); fprintf (stderr, "\n"); } ------------------------------------------------------------ revno: 100634 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2010-06-24 18:08:22 +0200 message: src/gtkutil.c (xg_update_scrollbar_pos): Avoid C99 mid-block variable declaration. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-06-22 12:28:08 +0000 +++ src/ChangeLog 2010-06-24 16:08:22 +0000 @@ -1,3 +1,8 @@ +2010-06-24 Juanma Barranquero + + * gtkutil.c (xg_update_scrollbar_pos): + Avoid C99 mid-block variable declaration. + 2010-06-22 Jan Djärv * xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar. === modified file 'src/gtkutil.c' --- src/gtkutil.c 2010-06-22 12:28:08 +0000 +++ src/gtkutil.c 2010-06-24 16:08:22 +0000 @@ -3213,6 +3213,7 @@ GtkWidget *wfixed = f->output_data.x->edit_widget; GtkWidget *wparent = gtk_widget_get_parent (wscroll); GtkFixed *wf = GTK_FIXED (wfixed); + gint msl; /* Clear out old position. */ GList *iter; @@ -3232,7 +3233,6 @@ /* Move and resize to new values. */ gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top); - gint msl; gtk_widget_style_get (wscroll, "min-slider-length", &msl, NULL); if (msl > height) { ------------------------------------------------------------ revno: 100633 [merge] committer: Mark A. Hershberger branch nick: trunk timestamp: Tue 2010-06-22 12:57:20 -0400 message: diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-06-15 20:13:34 +0000 +++ lisp/gnus/ChangeLog 2010-06-22 16:48:53 +0000 @@ -1,3 +1,8 @@ +2010-06-22 Mark A. Hershberger + + * mm-url.el (mm-url-encode-multipart-form-data): New function to handle + the *other* type of HTML form submission. + 2010-06-15 Michael Albinus * auth-source.el (auth-source-pick): If choice does not contain a === modified file 'lisp/gnus/mm-url.el' --- lisp/gnus/mm-url.el 2010-05-07 06:58:17 +0000 +++ lisp/gnus/mm-url.el 2010-06-22 16:48:53 +0000 @@ -418,6 +418,48 @@ (mm-url-form-encode-xwfu (cdr data)))) pairs "&")) +(defun mm-url-encode-multipart-form-data (pairs &optional boundary) + "Return PAIRS encoded in multipart/form-data." + ;; RFC1867 + + ;; Get a good boundary + (unless boundary + (setq boundary (mml-compute-boundary '()))) + + (concat + + ;; Start with the boundary + "--" boundary "\r\n" + + ;; Create name value pairs + (mapconcat + 'identity + ;; Delete any returned items that are empty + (delq nil + (mapcar (lambda (data) + (when (car data) + ;; For each pair + (concat + + ;; Encode the name + "Content-Disposition: form-data; name=\"" + (car data) "\"\r\n" + "Content-Type: text/plain; charset=utf-8\r\n" + "Content-Transfer-Encoding: binary\r\n\r\n" + + (cond ((stringp (cdr data)) + (cdr data)) + ((integerp (cdr data)) + (int-to-string (cdr data)))) + + "\r\n"))) + pairs)) + ;; use the boundary as a separator + (concat "--" boundary "\r\n")) + + ;; put a boundary at the end. + "--" boundary "--\r\n")) + (defun mm-url-fetch-form (url pairs) "Fetch a form from URL with PAIRS as the data using the POST method." (mm-url-load-url) === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-06-16 20:08:41 +0000 +++ lisp/url/ChangeLog 2010-06-22 16:48:53 +0000 @@ -1,3 +1,9 @@ +2010-06-22 Mark A. Hershberger + + * url-parse.el (url-user-for-url, url-password-for-url): + Convenience functions that get usernames and passwords for urls + from auth-source functions. + 2010-06-12 Štěpán Němec (tiny change) * url-vars.el (url-privacy-level): Fix doc typo. (Bug#6406) === modified file 'lisp/url/url-parse.el' --- lisp/url/url-parse.el 2010-01-13 08:35:10 +0000 +++ lisp/url/url-parse.el 2010-06-22 16:48:53 +0000 @@ -25,6 +25,7 @@ ;;; Code: (require 'url-vars) +(require 'auth-source) (eval-when-compile (require 'cl)) (autoload 'url-scheme-get-property "url-methods") @@ -174,6 +175,25 @@ (url-parse-make-urlobj prot user pass host port file refs attr full))))))) +(defmacro url-bit-for-url (method lookfor url) + `(let* ((urlobj (url-generic-parse-url url)) + (bit (funcall ,method urlobj)) + (methods (list 'url-recreate-url + 'url-host))) + (while (and (not bit) (> (length methods) 0)) + (setq bit + (auth-source-user-or-password + ,lookfor (funcall (pop methods) urlobj) (url-type urlobj)))) + bit)) + +(defun url-user-for-url (url) + "Attempt to use .authinfo to find a user for this URL." + (url-bit-for-url 'url-user "login" url)) + +(defun url-password-for-url (url) + "Attempt to use .authinfo to find a password for this URL." + (url-bit-for-url 'url-password "password" url)) + (provide 'url-parse) ;; arch-tag: f338325f-71ab-4bee-93cc-78fb9a03d403 ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.