------------------------------------------------------------ revno: 114885 author: Bozhidar Batsov committer: Dmitry Gutov branch nick: trunk timestamp: Fri 2013-11-01 07:35:35 +0400 message: * lisp/progmodes/ruby-mode.el (ruby-indent-tabs-mode) (ruby-indent-level, ruby-comment-column, ruby-deep-arglist): Add property :safe. (ruby-deep-arglist): Add property :type. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-31 07:27:35 +0000 +++ lisp/ChangeLog 2013-11-01 03:35:35 +0000 @@ -1,3 +1,10 @@ +2013-11-01 Bozhidar Batsov + + * progmodes/ruby-mode.el (ruby-indent-tabs-mode) + (ruby-indent-level, ruby-comment-column, ruby-deep-arglist): + Add property :safe. + (ruby-deep-arglist): Add property :type. + 2013-10-31 Glenn Morris * Makefile.in (custom-deps, finder-data): No need to setq the target === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-10-27 03:25:03 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-01 03:35:35 +0000 @@ -216,20 +216,28 @@ (defcustom ruby-indent-tabs-mode nil "Indentation can insert tabs in Ruby mode if this is non-nil." - :type 'boolean :group 'ruby) + :type 'boolean + :group 'ruby + :safe 'booleanp) (defcustom ruby-indent-level 2 "Indentation of Ruby statements." - :type 'integer :group 'ruby) + :type 'integer + :group 'ruby + :safe 'integerp) (defcustom ruby-comment-column (default-value 'comment-column) "Indentation column of comments." - :type 'integer :group 'ruby) + :type 'integer + :group 'ruby + :safe 'integerp) (defcustom ruby-deep-arglist t "Deep indent lists in parenthesis when non-nil. Also ignores spaces after parenthesis when 'space." - :group 'ruby) + :type 'boolean + :group 'ruby + :safe 'booleanp) (defcustom ruby-deep-indent-paren '(?\( ?\[ ?\] t) "Deep indent lists in parenthesis when non-nil. @@ -260,12 +268,6 @@ "Use `ruby-encoding-map' to set encoding magic comment if this is non-nil." :type 'boolean :group 'ruby) -;; Safe file variables -(put 'ruby-indent-tabs-mode 'safe-local-variable 'booleanp) -(put 'ruby-indent-level 'safe-local-variable 'integerp) -(put 'ruby-comment-column 'safe-local-variable 'integerp) -(put 'ruby-deep-arglist 'safe-local-variable 'booleanp) - ;;; SMIE support (require 'smie) ------------------------------------------------------------ revno: 114884 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-10-31 17:39:10 -0400 message: * configure.ac: Use [!...] rather than [^...], for ksh. (Bug#15769) diff: === modified file 'ChangeLog' --- ChangeLog 2013-10-30 06:40:15 +0000 +++ ChangeLog 2013-10-31 21:39:10 +0000 @@ -1,3 +1,7 @@ +2013-10-31 Glenn Morris + + * configure.ac: Use [!...] rather than [^...], for ksh. (Bug#15769) + 2013-10-30 Glenn Morris * Makefile.in (distclean, bootstrap-clean, maintainer-clean): === modified file 'configure.ac' --- configure.ac 2013-10-27 18:57:20 +0000 +++ configure.ac 2013-10-31 21:39:10 +0000 @@ -92,7 +92,7 @@ dnl configure sets LC_ALL=C early on, so this range should work. case "$var" in - *[[^\ -~]]*) AC_MSG_ERROR([Emacs cannot be built or installed in a directory whose name contains non-ASCII characters: $var]) ;; + *[[!\ -~]]*) AC_MSG_ERROR([Emacs cannot be built or installed in a directory whose name contains non-ASCII characters: $var]) ;; esac done ------------------------------------------------------------ revno: 114883 committer: Michael Albinus branch nick: trunk timestamp: Thu 2013-10-31 14:31:22 +0100 message: * automated/ert-tests.el (ert-test-stats-set-test-and-result): Add a skipping test. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2013-10-29 14:46:23 +0000 +++ test/ChangeLog 2013-10-31 13:31:22 +0000 @@ -1,3 +1,8 @@ +2013-10-31 Michael Albinus + + * automated/ert-tests.el (ert-test-stats-set-test-and-result): + Add a skipping test. + 2013-10-29 Stefan Monnier * indent/prolog.prolog: Test alignment of ->; with operator at bol. === modified file 'test/automated/ert-tests.el' --- test/automated/ert-tests.el 2013-10-24 07:38:45 +0000 +++ test/automated/ert-tests.el 2013-10-31 13:31:22 +0000 @@ -777,41 +777,57 @@ (stats (ert--make-stats (list test-1 test-2) 't)) (failed (make-ert-test-failed :condition nil :backtrace nil - :infos nil))) + :infos nil)) + (skipped (make-ert-test-skipped :condition nil + :backtrace nil + :infos nil))) (should (eql 2 (ert-stats-total stats))) (should (eql 0 (ert-stats-completed stats))) (should (eql 0 (ert-stats-completed-expected stats))) (should (eql 0 (ert-stats-completed-unexpected stats))) + (should (eql 0 (ert-stats-skipped stats))) (ert--stats-set-test-and-result stats 0 test-1 (make-ert-test-passed)) (should (eql 2 (ert-stats-total stats))) (should (eql 1 (ert-stats-completed stats))) (should (eql 1 (ert-stats-completed-expected stats))) (should (eql 0 (ert-stats-completed-unexpected stats))) + (should (eql 0 (ert-stats-skipped stats))) (ert--stats-set-test-and-result stats 0 test-1 failed) (should (eql 2 (ert-stats-total stats))) (should (eql 1 (ert-stats-completed stats))) (should (eql 0 (ert-stats-completed-expected stats))) (should (eql 1 (ert-stats-completed-unexpected stats))) + (should (eql 0 (ert-stats-skipped stats))) (ert--stats-set-test-and-result stats 0 test-1 nil) (should (eql 2 (ert-stats-total stats))) (should (eql 0 (ert-stats-completed stats))) (should (eql 0 (ert-stats-completed-expected stats))) (should (eql 0 (ert-stats-completed-unexpected stats))) + (should (eql 0 (ert-stats-skipped stats))) (ert--stats-set-test-and-result stats 0 test-3 failed) (should (eql 2 (ert-stats-total stats))) (should (eql 1 (ert-stats-completed stats))) (should (eql 0 (ert-stats-completed-expected stats))) (should (eql 1 (ert-stats-completed-unexpected stats))) + (should (eql 0 (ert-stats-skipped stats))) (ert--stats-set-test-and-result stats 1 test-2 (make-ert-test-passed)) (should (eql 2 (ert-stats-total stats))) (should (eql 2 (ert-stats-completed stats))) (should (eql 1 (ert-stats-completed-expected stats))) (should (eql 1 (ert-stats-completed-unexpected stats))) + (should (eql 0 (ert-stats-skipped stats))) (ert--stats-set-test-and-result stats 0 test-1 (make-ert-test-passed)) (should (eql 2 (ert-stats-total stats))) (should (eql 2 (ert-stats-completed stats))) (should (eql 2 (ert-stats-completed-expected stats))) - (should (eql 0 (ert-stats-completed-unexpected stats))))) + (should (eql 0 (ert-stats-completed-unexpected stats))) + (should (eql 0 (ert-stats-skipped stats))) + (ert--stats-set-test-and-result stats 0 test-1 skipped) + (should (eql 2 (ert-stats-total stats))) + (should (eql 2 (ert-stats-completed stats))) + (should (eql 1 (ert-stats-completed-expected stats))) + (should (eql 0 (ert-stats-completed-unexpected stats))) + (should (eql 1 (ert-stats-skipped stats))))) (provide 'ert-tests) ------------------------------------------------------------ revno: 114882 committer: Jan D. branch nick: trunk timestamp: Thu 2013-10-31 09:32:42 +0100 message: * emacs.c (main): Skip -psn args on OSX even if ! isatty (0). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-10-31 07:18:42 +0000 +++ src/ChangeLog 2013-10-31 08:32:42 +0000 @@ -1,3 +1,7 @@ +2013-10-31 Jan Djärv + + * emacs.c (main): Skip -psn args on OSX even if ! isatty (0). + 2013-10-31 Glenn Morris * emacs.c (original_pwd): New char. === modified file 'src/emacs.c' --- src/emacs.c 2013-10-31 07:18:42 +0000 +++ src/emacs.c 2013-10-31 08:32:42 +0000 @@ -1201,7 +1201,7 @@ chdir fails. */ if (! inhibit_window_system && ! isatty (0)) chdir (getenv ("HOME")); - else if (skip_args < argc) + if (skip_args < argc) { if (!strncmp (argv[skip_args], "-psn", 4)) {