------------------------------------------------------------ revno: 117480 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2014-07-07 05:47:59 +0000 message: lisp/gnus/gnus-start.el (gnus-dribble-read-file): Don't stop auto-saving diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-06-26 06:55:15 +0000 +++ lisp/gnus/ChangeLog 2014-07-07 05:47:59 +0000 @@ -1,3 +1,9 @@ +2014-07-07 Katsumi Yamaoka + + * gnus-start.el (gnus-dribble-read-file): Don't stop the auto-saving of + the dribble buffer even when it is shrunk a lot. + + 2014-06-26 Glenn Morris * mm-util.el (help-function-arglist): Remove outdated declaration. === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2014-03-23 23:13:36 +0000 +++ lisp/gnus/gnus-start.el 2014-07-07 05:47:59 +0000 @@ -889,6 +889,11 @@ (setq buffer-save-without-query t) (erase-buffer) (setq buffer-file-name dribble-file) + ;; The buffer may be shrunk a lot when deleting old entries. + ;; It caused the auto-saving to stop. + (if (featurep 'emacs) + (set (make-local-variable 'auto-save-include-big-deletions) t) + (set (make-local-variable 'disable-auto-save-when-buffer-shrinks) nil)) (auto-save-mode t) (buffer-disable-undo) (bury-buffer (current-buffer)) ------------------------------------------------------------ revno: 117479 [merge] committer: K. Handa branch nick: trunk timestamp: Sat 2014-07-05 23:12:23 +0900 message: * coding.c (MIN_CHARBUF_SIZE): Delete it. (MAX_CHARBUF_EXTRA_SIZE): New macro. (ALLOC_CONVERSION_WORK_AREA): Use MAX_CHARBUF_EXTRA_SIZE. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-07-04 02:28:54 +0000 +++ src/ChangeLog 2014-07-05 14:07:57 +0000 @@ -1,3 +1,9 @@ +2014-07-04 K. Handa + + * coding.c (MIN_CHARBUF_SIZE): Delete it. + (MAX_CHARBUF_EXTRA_SIZE): New macro. + (ALLOC_CONVERSION_WORK_AREA): Use MAX_CHARBUF_EXTRA_SIZE. + 2014-07-04 Dmitry Antipov * font.h (struct font_driver): Remove get_outline and free_outline; === modified file 'src/coding.c' --- src/coding.c 2014-06-30 15:39:29 +0000 +++ src/coding.c 2014-07-01 15:34:58 +0000 @@ -7266,14 +7266,17 @@ } #define MAX_CHARBUF_SIZE 0x4000 -/* emacs-mule decoding requires more than 16 bytes. */ -#define MIN_CHARBUF_SIZE 0x20 +/* How many units decoding functions expect in coding->charbuf at + most. Currently, decode_coding_emacs_mule expects the following + size, and that is the largest value. */ +#define MAX_CHARBUF_EXTRA_SIZE ((MAX_ANNOTATION_LENGTH * 3) + 1) #define ALLOC_CONVERSION_WORK_AREA(coding, size) \ do { \ - int units = ((size) > MAX_CHARBUF_SIZE ? MAX_CHARBUF_SIZE \ - : (size) < MIN_CHARBUF_SIZE ? MIN_CHARBUF_SIZE \ - : size); \ + int units = (size) + MAX_CHARBUF_EXTRA_SIZE; \ + \ + if (units > MAX_CHARBUF_SIZE) \ + units = MAX_CHARBUF_SIZE; \ coding->charbuf = SAFE_ALLOCA ((units) * sizeof (int)); \ coding->charbuf_size = (units); \ } while (0) ------------------------------------------------------------ revno: 117478 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-07-04 12:07:45 +0200 message: * automated/dbus-tests.el (dbus-test02-register-service-session) (dbus-test02-register-service-system): Fix docstring. (dbus-test02-register-service-own-bus) (dbus-test03-peer-interface): New tests. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-07-03 06:00:53 +0000 +++ test/ChangeLog 2014-07-04 10:07:45 +0000 @@ -1,3 +1,10 @@ +2014-07-04 Michael Albinus + + * automated/dbus-tests.el (dbus-test02-register-service-session) + (dbus-test02-register-service-system): Fix docstring. + (dbus-test02-register-service-own-bus) + (dbus-test03-peer-interface): New tests. + 2014-07-03 Fabián Ezequiel Gallina * automated/python-tests.el (python-tests-self-insert): New function. === modified file 'test/automated/dbus-tests.el' --- test/automated/dbus-tests.el 2014-06-27 18:20:21 +0000 +++ test/automated/dbus-tests.el 2014-07-04 10:07:45 +0000 @@ -103,7 +103,7 @@ (should-error (dbus-unregister-service bus dbus-service-dbus))) (ert-deftest dbus-test02-register-service-session () - "Check service registration at `:session'." + "Check service registration at `:session' bus." (skip-unless (and dbus--test-enabled-session-bus (dbus-register-service :session dbus-service-emacs))) (dbus--test-register-service :session) @@ -121,11 +121,57 @@ (should (eq (dbus-unregister-service :session service) :not-owner))))) (ert-deftest dbus-test02-register-service-system () - "Check service registration at `:system'." + "Check service registration at `:system' bus." (skip-unless (and dbus--test-enabled-system-bus (dbus-register-service :system dbus-service-emacs))) (dbus--test-register-service :system)) +(ert-deftest dbus-test02-register-service-own-bus () + "Check service registration with an own bus. +This includes initialization and closing the bus." + ;; Start bus. + (let ((output + (ignore-errors + (shell-command-to-string "dbus-launch --sh-syntax"))) + bus pid) + (skip-unless (stringp output)) + (when (string-match "DBUS_SESSION_BUS_ADDRESS='\\(.+\\)';" output) + (setq bus (match-string 1 output))) + (when (string-match "DBUS_SESSION_BUS_PID=\\([[:digit:]]+\\);" output) + (setq pid (match-string 1 output))) + (unwind-protect + (progn + (skip-unless + (dbus-ignore-errors + (and bus pid + (featurep 'dbusbind) + (dbus-init-bus bus) + (dbus-get-unique-name bus) + (dbus-register-service bus dbus-service-emacs)))) + ;; Run the test. + (dbus--test-register-service bus)) + + ;; Save exit. + (when pid (call-process "kill" nil nil nil pid))))) + +(ert-deftest dbus-test03-peer-interface () + "Check `dbus-interface-peer' methods." + (skip-unless + (and dbus--test-enabled-session-bus + (dbus-register-service :session dbus-service-emacs) + ;; "GetMachineId" is not implemented (yet). When it returns a + ;; value, another D-Bus client like dbus-monitor is reacting + ;; on `dbus-interface-peer'. We cannot test then. + (not + (dbus-ignore-errors + (dbus-call-method + :session dbus-service-emacs dbus-path-dbus + dbus-interface-peer "GetMachineId" :timeout 100))))) + + (should (dbus-ping :session dbus-service-emacs 100)) + (dbus-unregister-service :session dbus-service-emacs) + (should-not (dbus-ping :session dbus-service-emacs 100))) + (defun dbus-test-all (&optional interactive) "Run all tests for \\[dbus]." (interactive "p") ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.