Now on revision 107602. ------------------------------------------------------------ revno: 107602 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-03-14 03:44:09 +0100 message: Always call the callback when timing out url-queue jobs * url-queue.el (url-queue-kill-job): Make sure that the callback is always called, even if we have a timeout. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2012-03-11 15:12:26 +0000 +++ lisp/url/ChangeLog 2012-03-14 02:44:09 +0000 @@ -1,3 +1,8 @@ +2012-03-14 Lars Magne Ingebrigtsen + + * url-queue.el (url-queue-kill-job): Make sure that the callback + is always called, even if we have a timeout. + 2012-03-11 Chong Yidong * url-http.el (url-http-end-of-document-sentinel): Handle === modified file 'lisp/url/url-queue.el' --- lisp/url/url-queue.el 2012-02-20 12:12:48 +0000 +++ lisp/url/url-queue.el 2012-03-14 02:44:09 +0000 @@ -156,9 +156,20 @@ (while (setq process (get-buffer-process (url-queue-buffer job))) (set-process-sentinel process 'ignore) (ignore-errors - (delete-process process)))) - (ignore-errors - (kill-buffer (url-queue-buffer job))))) + (delete-process process))))) + ;; Call the callback with an error message to ensure that the caller + ;; is notified that the job has failed. + (with-current-buffer + (if (bufferp (url-queue-buffer job)) + ;; Use the (partially filled) process buffer it it exists. + (url-queue-buffer job) + ;; If not, just create a new buffer, which will probably be + ;; killed again by the caller. + (generate-new-buffer " *temp*")) + (apply (url-queue-callback job) + (cons (list :error (list 'error 'url-queue-timeout + "Queue timeout exceeded")) + (url-queue-cbargs job))))) (provide 'url-queue) ------------------------------------------------------------ revno: 107601 committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2012-03-13 23:27:56 +0000 message: mail/sendmail.el (mail-encode-header): Bind rfc2047-encode-encoded-words to nil. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-13 17:56:31 +0000 +++ lisp/ChangeLog 2012-03-13 23:27:56 +0000 @@ -1,3 +1,8 @@ +2012-03-13 Katsumi Yamaoka + + * mail/sendmail.el (mail-encode-header): + Bind rfc2047-encode-encoded-words to nil. + 2012-03-13 Glenn Morris * calendar/calendar.el (calendar-string-spread): === modified file 'lisp/mail/sendmail.el' --- lisp/mail/sendmail.el 2012-03-10 09:11:22 +0000 +++ lisp/mail/sendmail.el 2012-03-13 23:27:56 +0000 @@ -1085,9 +1085,10 @@ (cons selected mm-coding-system-priorities) mm-coding-system-priorities)) (tick (buffer-chars-modified-tick)) - ;; rms: this proved necessary, but I don't recall why. - ;; Can anyone determine why, and state it here? - (rfc2047-encode-encoded-words t)) + ;; Many mailers, including Gnus, passes a message of which + ;; the header is already encoded, so this is necessary to + ;; prevent it from being encoded again. + (rfc2047-encode-encoded-words nil)) (rfc2047-encode-message-header) (= tick (buffer-chars-modified-tick))))) ------------------------------------------------------------ revno: 107600 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-03-13 13:56:31 -0400 message: Small calendar-string-spread fix for bug#10978 * lisp/calendar/calendar.el (calendar-string-spread): Handle non-unit-width characters a bit better. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-13 10:40:29 +0000 +++ lisp/ChangeLog 2012-03-13 17:56:31 +0000 @@ -1,3 +1,8 @@ +2012-03-13 Glenn Morris + + * calendar/calendar.el (calendar-string-spread): + Handle non-unit-width characters a bit better. (Bug#10978) + 2012-03-13 Leo Liu * vc/vc-hg.el (vc-hg-working-revision): Rework to work with both === modified file 'lisp/calendar/calendar.el' --- lisp/calendar/calendar.el 2012-03-06 02:18:29 +0000 +++ lisp/calendar/calendar.el 2012-03-13 17:56:31 +0000 @@ -1756,8 +1756,8 @@ (if (< (length strings) 2) (append (list "") strings (list "")) strings))) - (n (- length (length (apply 'concat strings)))) - (m (1- (length strings))) + (n (- length (string-width (apply 'concat strings)))) + (m (* (1- (length strings)) (char-width char))) (s (car strings)) (strings (cdr strings)) (i 0)) @@ -1766,7 +1766,7 @@ (make-string (max 0 (/ (+ n i) m)) char) string) i (1+ i))) - (substring s 0 length))) + (truncate-string-to-width s length))) (defun calendar-update-mode-line () "Update the calendar mode line with the current date and date style." ------------------------------------------------------------ revno: 107599 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-03-13 09:15:51 -0700 message: Adjust NEWS entry for recent change diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-03-13 07:22:12 +0000 +++ etc/NEWS 2012-03-13 16:15:51 +0000 @@ -1371,7 +1371,7 @@ +++ ** The new function `server-eval-at' allows evaluation of Lisp forms on -named Emacs server instances, using TCP sockets. +named Emacs server instances. +++ ** `call-process' and `call-process-region' allow a `(:file "file")' spec ------------------------------------------------------------ revno: 107598 fixes bug(s): http://debbugs.gnu.org/10822 committer: Leo Liu branch nick: trunk timestamp: Tue 2012-03-13 18:40:29 +0800 message: * lisp/vc/vc-hg.el (vc-hg-working-revision): Rework to work with both directory and file as argument. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-13 07:07:10 +0000 +++ lisp/ChangeLog 2012-03-13 10:40:29 +0000 @@ -1,3 +1,8 @@ +2012-03-13 Leo Liu + + * vc/vc-hg.el (vc-hg-working-revision): Rework to work with both + directory and file as argument (Bug#10822). + 2012-03-13 Kaushik Srenevasan (tiny change) * progmodes/gdb-mi.el (gdb-invalidate-disassembly): === modified file 'lisp/vc/vc-hg.el' --- lisp/vc/vc-hg.el 2012-02-25 04:29:09 +0000 +++ lisp/vc/vc-hg.el 2012-03-13 10:40:29 +0000 @@ -226,45 +226,14 @@ (defun vc-hg-working-revision (file) "Hg-specific version of `vc-working-revision'." - (let* - ((status nil) - (default-directory (file-name-directory file)) - ;; Avoid localization of messages so we can parse the output. - (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C") - process-environment)) - (out - (with-output-to-string - (with-current-buffer - standard-output - (setq status - (condition-case nil - (let ((process-environment avoid-local-env)) - ;; Ignore all errors. - (process-file - vc-hg-program nil t nil - "--config" "alias.parents=parents" - "--config" "defaults.parents=" - "parents" "--template" "{rev}" (file-relative-name file))) - ;; Some problem happened. E.g. We can't find an `hg' - ;; executable. - (error nil))))))) - (if (eq 0 status) - out - ;; Check if the file is in the 'added state, the above hg - ;; command does not distinguish between 'added and 'unregistered. - (setq status - (condition-case nil - (let ((process-environment avoid-local-env)) - (process-file - vc-hg-program nil nil nil - ;; We use "log" here, if there's a faster command - ;; that returns true for an 'added file and false - ;; for an 'unregistered one, we could use that. - "log" "-l1" (file-relative-name file))) - ;; Some problem happened. E.g. We can't find an `hg' - ;; executable. - (error nil))) - (when (eq 0 status) "0")))) + (let ((default-directory (if (file-directory-p file) + (file-name-as-directory file) + (file-name-directory file)))) + (ignore-errors + (with-output-to-string + (process-file vc-hg-program nil standard-output nil + "log" "-l" "1" "--template" "{rev}" + (file-relative-name file)))))) ;;; History functions ------------------------------------------------------------ revno: 107597 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-03-13 00:22:12 -0700 message: Mention bulgarian-alt-phonetic in NEWS diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-03-12 22:35:55 +0000 +++ etc/NEWS 2012-03-13 07:22:12 +0000 @@ -251,7 +251,8 @@ cannot be encoded by the `terminal-coding-system'. --- -*** New input methods for Farsi: farsi and farsi-translit. +*** New input methods for Farsi: farsi and farsi-translit; +and for Bulgarian: bulgarian-alt-phonetic. +++ *** `nobreak-char-display' now also highlights Unicode hyphen chars ------------------------------------------------------------ revno: 107596 fixes bug(s): http://debbugs.gnu.org/10893 author: Йордан Миладинов committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-03-13 00:21:15 -0700 message: * cyrillic.el (bulgarian-alt-phonetic): New input method. (tiny change) diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2012-03-12 22:35:55 +0000 +++ leim/ChangeLog 2012-03-13 07:21:15 +0000 @@ -1,3 +1,8 @@ +2012-03-13 Йордан Миладинов (tiny change) + + * quail/cyrillic.el (bulgarian-alt-phonetic): + New input method. (Bug#10893) + 2012-03-09 Mohsen BANAN * quail/persian.el: Update which includes: (1) full compliance to === modified file 'leim/quail/cyrillic.el' --- leim/quail/cyrillic.el 2012-01-19 07:21:25 +0000 +++ leim/quail/cyrillic.el 2012-03-13 07:21:15 +0000 @@ -1236,6 +1236,79 @@ ("." ?$,1(n(B) ("/" ?.)) +(quail-define-package + "bulgarian-alt-phonetic" "Bulgarian" "$,1(1(=(D(B" + nil + "Bulgarian alternative Phonetic keyboard layout, producing Unicode. + +This phonetic layout replaces all the Latin letters with Bulgarian +\(Cyrillic\) letters based on similarities in their pronunciation or look. + +Note that, since the letters ',Li(B', ',Ll(B', ',Ln(B' and ',Lo(B' are attached to the +']', '\', '`' and '[' keys respectively, Caps Lock does not affect them." +nil t t t t nil nil nil nil nil t) + +;; $,1(N(B 1! 2@ 3$,1uV(B 4$ 5% 6$,1tL(B 7,A'(B 8* 9( 0) -$,1rs(B =+ $,1(l(}(B +;; $,1(G(B $,1(H(B $,1(5(B $,1(@(B $,1(B(B $,1(J(B $,1(C(B $,1(8(B $,1(>(B $,1(?(B $,1(O(B $,1(I(B +;; ,L0(B $,1(A(B $,1(4(B $,1(D(B $,1(3(B $,1(E(B $,1(9(B $,1(:(B $,1(;(B :; '" +;; $,1(7(B $,1(6(B $,1(F(B $,1(2(B $,1(1(B $,1(=(B $,1(<(B ,$,1r~(B .$,1r|(B /? + +(quail-define-rules + ("#" ?,Lp(B) + ("&" ?,A'(B) + ("/#" ?#) + ("/&" ?&) + ("/<" ?<) + ("/>" ?>) + ("/[" ?\[) + ("/\\" ?\\) + ("/]" ?\]) + ("/^" ?^) + ("/_" ?_) + ("/`" ?`) + ("/{" ?{) + ("/|" ?|) + ("/}" ?}) + ("/~" ?~) + ("<" ?$,1r~(B) + (">" ?$,1r|(B) + ("A" ?$,1(0(B) ("a" ?$,1(P(B) + ("B" ?$,1(1(B) ("b" ?$,1(Q(B) + ("C" ?$,1(F(B) ("c" ?$,1(f(B) + ("D" ?$,1(4(B) ("d" ?$,1(T(B) + ("E" ?$,1(5(B) ("e" ?$,1(U(B) + ("F" ?$,1(D(B) ("f" ?$,1(d(B) + ("G" ?$,1(3(B) ("g" ?$,1(S(B) + ("H" ?$,1(E(B) ("h" ?$,1(e(B) + ("I" ?$,1(8(B) ("i" ?$,1(X(B) + ("J" ?$,1(9(B) ("j" ?$,1(Y(B) + ("K" ?$,1(:(B) ("k" ?$,1(Z(B) + ("L" ?$,1(;(B) ("l" ?$,1([(B) + ("M" ?$,1(<(B) ("m" ?$,1(\(B) + ("N" ?$,1(=(B) ("n" ?$,1(](B) + ("O" ?$,1(>(B) ("o" ?$,1(^(B) + ("P" ?$,1(?(B) ("p" ?$,1(_(B) + ("Q" ?$,1(G(B) ("q" ?$,1(g(B) + ("R" ?$,1(@(B) ("r" ?$,1(`(B) + ("S" ?$,1(A(B) ("s" ?$,1(a(B) + ("T" ?$,1(B(B) ("t" ?$,1(b(B) + ("U" ?$,1(C(B) ("u" ?$,1(c(B) + ("V" ?$,1(2(B) ("v" ?$,1(R(B) + ("W" ?$,1(H(B) ("w" ?$,1(h(B) + ("X" ?$,1(6(B) ("x" ?$,1(V(B) + ("Y" ?$,1(J(B) ("y" ?$,1(j(B) + ("Z" ?$,1(7(B) ("z" ?$,1(W(B) + ("[" ?$,1(o(B) + ("\\" ?$,1(l(B) + ("]" ?$,1(i(B) + ("^" ?$,1tL(B) + ("_" ?$,1rs(B) + ("`" ?$,1(n(B) + ("{" ?$,1(O(B) + ("|" ?$,1(}(B) + ("}" ?$,1(I(B) + ("~" ?$,1(N(B)) + ;; From `Bulgarian-PHO.kmap for Yudit', Alexander Shopov ;; . ------------------------------------------------------------ revno: 107595 fixes bug(s): http://debbugs.gnu.org/10597 author: Kaushik Srenevasan committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-03-13 00:07:10 -0700 message: GDB change for dynamically generated code (tiny change) Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00753.html * lisp/progmodes/gdb-mi.el (gdb-invalidate-disassembly): For dynamically generated code, follow $PC. (gdb-disassembly-handler-custom): Handle no function name case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-13 06:54:37 +0000 +++ lisp/ChangeLog 2012-03-13 07:07:10 +0000 @@ -1,3 +1,9 @@ +2012-03-13 Kaushik Srenevasan (tiny change) + + * progmodes/gdb-mi.el (gdb-invalidate-disassembly): + For dynamically generated code, follow $PC. + (gdb-disassembly-handler-custom): Handle no function name case. + 2012-03-13 Tim Landscheidt (tiny change) * calendar/icalendar.el (icalendar-export-file, icalendar-import-file): === modified file 'lisp/progmodes/gdb-mi.el' --- lisp/progmodes/gdb-mi.el 2012-03-06 08:37:38 +0000 +++ lisp/progmodes/gdb-mi.el 2012-03-13 07:07:10 +0000 @@ -3269,8 +3269,12 @@ (let* ((frame (gdb-current-buffer-frame)) (file (bindat-get-field frame 'fullname)) (line (bindat-get-field frame 'line))) - (when file - (format "-data-disassemble -f %s -l %s -n -1 -- 0" file line))) + (if file + (format "-data-disassemble -f %s -l %s -n -1 -- 0" file line) + ;; If we're unable to get a file name / line for $PC, simply + ;; follow $PC, disassembling the next 10 (x ~15 (on IA) == + ;; 150 bytes) instructions. + "-data-disassemble -s $pc -e \"$pc + 150\" -- 0")) gdb-disassembly-handler ;; We update disassembly only after we have actual frame information ;; about all threads, so no there's `update' signal in this list @@ -3329,8 +3333,12 @@ (gdb-table-add-row table (list (bindat-get-field instr 'address) - (apply #'format "<%s+%s>:" - (gdb-get-many-fields instr 'func-name 'offset)) + (let + ((func-name (bindat-get-field instr 'func-name)) + (offset (bindat-get-field instr 'offset))) + (if func-name + (format "<%s+%s>:" func-name offset) + "")) (bindat-get-field instr 'inst))) (when (string-equal (bindat-get-field instr 'address) address) ------------------------------------------------------------ revno: 107594 fixes bug(s): http://debbugs.gnu.org/11002 author: Tim Landscheidt committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-03-12 23:54:37 -0700 message: Fix some missing trailing whitespace (tiny change) * lisp/calendar/icalendar.el (icalendar-export-file, icalendar-import-file): * lisp/emulation/ws-mode.el (ws-query-replace): * lisp/sort.el (sort-regexp-fields): Fix missing trailing whitespace in interactive prompts. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-12 20:07:45 +0000 +++ lisp/ChangeLog 2012-03-13 06:54:37 +0000 @@ -1,3 +1,10 @@ +2012-03-13 Tim Landscheidt (tiny change) + + * calendar/icalendar.el (icalendar-export-file, icalendar-import-file): + * emulation/ws-mode.el (ws-query-replace): + * sort.el (sort-regexp-fields): + Fix missing trailing whitespace in interactive prompts. (Bug#11002) + 2012-03-12 Stefan Monnier * dabbrev.el: Fix cycle completion order (bug#10963). === modified file 'lisp/calendar/icalendar.el' --- lisp/calendar/icalendar.el 2012-01-19 07:21:25 +0000 +++ lisp/calendar/icalendar.el 2012-03-13 06:54:37 +0000 @@ -915,7 +915,7 @@ "Export diary file to iCalendar format. All diary entries in the file DIARY-FILENAME are converted to iCalendar format. The result is appended to the file ICAL-FILENAME." - (interactive "FExport diary data from file: + (interactive "FExport diary data from file: \n\ Finto iCalendar file: ") (save-current-buffer (set-buffer (find-file diary-filename)) @@ -1794,7 +1794,7 @@ Argument DIARY-FILENAME input `diary-file'. Optional argument NON-MARKING determines whether events are created as non-marking or not." - (interactive "fImport iCalendar data from file: + (interactive "fImport iCalendar data from file: \n\ Finto diary file: p") ;; clean up the diary file === modified file 'lisp/emulation/ws-mode.el' --- lisp/emulation/ws-mode.el 2012-01-19 07:21:25 +0000 +++ lisp/emulation/ws-mode.el 2012-03-13 06:54:37 +0000 @@ -716,7 +716,7 @@ (defun ws-query-replace (from to) "In WordStar mode: Search string, remember string for repetition." - (interactive "sReplace: + (interactive "sReplace: \n\ sWith: " ) (setq ws-search-string from) (setq ws-search-direction t) === modified file 'lisp/sort.el' --- lisp/sort.el 2012-01-19 07:21:25 +0000 +++ lisp/sort.el 2012-03-13 06:54:37 +0000 @@ -423,7 +423,7 @@ ;; using negative prefix arg to mean "reverse" is now inconsistent with ;; other sort-.*fields functions but then again this was before, since it ;; didn't use the magnitude of the arg to specify anything. - (interactive "P\nsRegexp specifying records to sort: + (interactive "P\nsRegexp specifying records to sort: \n\ sRegexp specifying key within record: \nr") (cond ((or (equal key-regexp "") (equal key-regexp "\\&")) (setq key-regexp 0))