Now on revision 106096. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106096 committer: martin rudalics branch nick: trunk timestamp: Mon 2011-10-17 14:52:31 +0200 message: Rewrite window related menu entries. (Bug#6786) * menu-bar.el (menu-bar-file-menu): Add entry for making new window on right of selected. (Bug#6786) Reword other window entries and separate them from frame entries. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-15 19:24:14 +0000 +++ lisp/ChangeLog 2011-10-17 12:52:31 +0000 @@ -1,3 +1,9 @@ +2011-10-17 Martin Rudalics + + * menu-bar.el (menu-bar-file-menu): Add entry for making new + window on right of selected. (Bug#6786) Reword other window + entries and separate them from frame entries. + 2011-10-15 Glenn Morris * emacs-lisp/ert.el (ert--explain-equal-rec, ert-select-tests): === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2011-09-18 20:43:20 +0000 +++ lisp/menu-bar.el 2011-10-17 12:52:31 +0000 @@ -92,17 +92,25 @@ :visible (fboundp 'make-frame-command) :help ,(purecopy "Open a new frame"))) + (define-key menu [separator-frame] + menu-bar-separator) + (define-key menu [one-window] - `(menu-item ,(purecopy "Remove Splits") delete-other-windows + `(menu-item ,(purecopy "Remove Other Windows") delete-other-windows :enable (not (one-window-p t nil)) - :help ,(purecopy - "Selected window grows to fill the whole frame"))) - - (define-key menu [split-window] - `(menu-item ,(purecopy "Split Window") split-window-vertically - :enable (and (menu-bar-menu-frame-live-and-visible-p) - (menu-bar-non-minibuffer-window-p)) - :help ,(purecopy "Split selected window in two windows"))) + :help ,(purecopy "Make selected window fill whole frame"))) + + (define-key menu [new-window-on-right] + `(menu-item ,(purecopy "New Window on Right") split-window-side-by-side + :enable (and (menu-bar-menu-frame-live-and-visible-p) + (menu-bar-non-minibuffer-window-p)) + :help ,(purecopy "Make new window on right of selected one"))) + + (define-key menu [new-window-below] + `(menu-item ,(purecopy "New Window Below") split-window-above-each-other + :enable (and (menu-bar-menu-frame-live-and-visible-p) + (menu-bar-non-minibuffer-window-p)) + :help ,(purecopy "Make new window below selected one"))) (define-key menu [separator-window] menu-bar-separator) @@ -433,7 +441,7 @@ (defvar menu-bar-edit-menu (let ((menu (make-sparse-keymap "Edit"))) - + (define-key menu [props] `(menu-item ,(purecopy "Text Properties") facemenu-menu)) @@ -1645,7 +1653,7 @@ (defvar menu-bar-search-documentation-menu (let ((menu (make-sparse-keymap "Search Documentation"))) - + (define-key menu [search-documentation-strings] `(menu-item ,(purecopy "Search Documentation Strings...") apropos-documentation :help ------------------------------------------------------------ revno: 106095 author: Daiki Ueno committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-10-17 04:29:19 +0000 message: Merge changes made in Gnus trunk. mml2015.el (mml2015-epg-find-usable-key): Skip the whole key if the primary key is marked as disabled. mml1991.el (mml1991-epg-find-usable-key): Ditto. Thanks to Christian von Roques . diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-11 20:20:08 +0000 +++ lisp/gnus/ChangeLog 2011-10-17 04:29:19 +0000 @@ -1,3 +1,10 @@ +2011-10-17 Daiki Ueno + + * mml2015.el (mml2015-epg-find-usable-key): Skip the whole key if the + primary key is marked as disabled. + * mml1991.el (mml1991-epg-find-usable-key): Ditto. + Thanks to Christian von Roques . + 2011-10-11 Andreas Schwab * html2text.el (html2text-clean-anchor): Check for quotes around === modified file 'lisp/gnus/mml1991.el' --- lisp/gnus/mml1991.el 2011-08-04 06:55:53 +0000 +++ lisp/gnus/mml1991.el 2011-10-17 04:29:19 +0000 @@ -282,13 +282,16 @@ (catch 'found (while keys (let ((pointer (epg-key-sub-key-list (car keys)))) - (while pointer - (if (and (memq usage (epg-sub-key-capability (car pointer))) - (not (memq 'disabled (epg-sub-key-capability (car pointer)))) - (not (memq (epg-sub-key-validity (car pointer)) - '(revoked expired)))) - (throw 'found (car keys))) - (setq pointer (cdr pointer)))) + ;; The primary key will be marked as disabled, when the entire + ;; key is disabled (see 12 Field, Format of colon listings, in + ;; gnupg/doc/DETAILS) + (unless (memq 'disabled (epg-sub-key-capability (car pointer))) + (while pointer + (if (and (memq usage (epg-sub-key-capability (car pointer))) + (not (memq (epg-sub-key-validity (car pointer)) + '(revoked expired)))) + (throw 'found (car keys))) + (setq pointer (cdr pointer))))) (setq keys (cdr keys))))) ;; XXX: since gpg --list-secret-keys does not return validity of each === modified file 'lisp/gnus/mml2015.el' --- lisp/gnus/mml2015.el 2011-08-28 22:04:32 +0000 +++ lisp/gnus/mml2015.el 2011-10-17 04:29:19 +0000 @@ -788,13 +788,16 @@ (catch 'found (while keys (let ((pointer (epg-key-sub-key-list (car keys)))) - (while pointer - (if (and (memq usage (epg-sub-key-capability (car pointer))) - (not (memq 'disabled (epg-sub-key-capability (car pointer)))) - (not (memq (epg-sub-key-validity (car pointer)) - '(revoked expired)))) - (throw 'found (car keys))) - (setq pointer (cdr pointer)))) + ;; The primary key will be marked as disabled, when the entire + ;; key is disabled (see 12 Field, Format of colon listings, in + ;; gnupg/doc/DETAILS) + (unless (memq 'disabled (epg-sub-key-capability (car pointer))) + (while pointer + (if (and (memq usage (epg-sub-key-capability (car pointer))) + (not (memq (epg-sub-key-validity (car pointer)) + '(revoked expired)))) + (throw 'found (car keys))) + (setq pointer (cdr pointer))))) (setq keys (cdr keys))))) ;; XXX: since gpg --list-secret-keys does not return validity of each ------------------------------------------------------------ revno: 106094 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-10-15 13:56:02 -0700 message: * test/automated/f90.el: New file. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2011-09-27 18:52:00 +0000 +++ test/ChangeLog 2011-10-15 20:56:02 +0000 @@ -1,3 +1,7 @@ +2011-10-15 Glenn Morris + + * automated/f90.el: New file. + 2011-09-27 Ulf Jasper * automated/newsticker-tests.el: Move newsticker-testsuite.el === added file 'test/automated/f90.el' --- test/automated/f90.el 1970-01-01 00:00:00 +0000 +++ test/automated/f90.el 2011-10-15 20:56:02 +0000 @@ -0,0 +1,158 @@ +;;; f90.el --- tests for progmodes/f90.el + +;; Copyright (C) 2011 Free Software Foundation, Inc. + +;; Author: Glenn Morris + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; This file does not have "test" in the name, because it lives under +;; a test/ directory, so that would be superfluous. + +;;; Code: + +(require 'ert) +(require 'f90) + +(defconst f90-test-indent "\ +!! Comment before code. +!!! Comments before code. +#preprocessor before code + +program progname + + implicit none + + integer :: i + + !! Comment. + + do i = 1, 10 + +#preprocessor + + !! Comment. + if ( i % 2 == 0 ) then + !! Comment. + cycle + else + write(*,*) i + end if + end do + +!!! Comment. + +end program progname +" + "Test string for F90 indentation.") + +(ert-deftest f90-test-indent () + "Test F90 indentation." + (with-temp-buffer + (f90-mode) + (insert f90-test-indent) + (indent-rigidly (point-min) (point-max) -999) + (f90-indent-region (point-min) (point-max)) + (should (string-equal (buffer-string) f90-test-indent)))) + +(ert-deftest f90-test-bug3729 () + "Test for http://debbugs.gnu.org/3729 ." + :expected-result :failed + (with-temp-buffer + (f90-mode) + (insert "!! Comment + +include \"file.f90\" + +subroutine test (x) + real x + x = x+1. + return +end subroutine test") + (goto-char (point-min)) + (forward-line 2) + (f90-indent-subprogram) + (should (= 0 (current-indentation))))) + +(ert-deftest f90-test-bug3730 () + "Test for http://debbugs.gnu.org/3730 ." + (with-temp-buffer + (f90-mode) + (insert "a" ) + (move-to-column 68 t) + (insert "(/ x /)") + (f90-do-auto-fill) + (beginning-of-line) + (skip-chars-forward "[ \t]") + (should (equal "&(/" (buffer-substring (point) (+ 3 (point))))))) + +;; TODO bug#5593 + +(ert-deftest f90-test-bug8691 () + "Test for http://debbugs.gnu.org/8691 ." + (with-temp-buffer + (f90-mode) + (insert "module modname +type, bind(c) :: type1 +integer :: part1 +end type type1 +end module modname") + (f90-indent-subprogram) + (forward-line -1) + (should (= 2 (current-indentation))))) + +;; TODO bug#8812 + +(ert-deftest f90-test-bug8820 () + "Test for http://debbugs.gnu.org/8820 ." + (with-temp-buffer + (f90-mode) + (should (eq (char-syntax ?%) (string-to-char "."))))) + +(ert-deftest f90-test-bug9553a () + "Test for http://debbugs.gnu.org/9553 ." + (with-temp-buffer + (f90-mode) + (insert "!!!") + (dotimes (_i 20) (insert " aaaa")) + (f90-do-auto-fill) + (beginning-of-line) + ;; This gives a more informative failure than looking-at. + (should (equal "!!! a" (buffer-substring (point) (+ 5 (point))))))) + +(ert-deftest f90-test-bug9553b () + "Test for http://debbugs.gnu.org/9553 ." + (with-temp-buffer + (f90-mode) + (insert "!!!") + (dotimes (_i 13) (insert " aaaa")) + (insert "a, aaaa") + (f90-do-auto-fill) + (beginning-of-line) + (should (equal "!!! a" (buffer-substring (point) (+ 5 (point))))))) + +(ert-deftest f90-test-bug9690 () + "Test for http://debbugs.gnu.org/9690 ." + (with-temp-buffer + (f90-mode) + (insert "#include \"foo.h\"") + (f90-indent-line) + (should (= 0 (current-indentation))))) + + +;;; f90.el ends here