Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103588. ------------------------------------------------------------ revno: 103588 author: Arni Magnusson committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-03-07 20:42:40 -0800 message: texinfo.el addition for bug#2783. * lisp/textmodes/texinfo.el (texinfo-environments): Add deftypecv, deftypeivar, deftypemethod, deftypeop, html. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-08 04:34:31 +0000 +++ lisp/ChangeLog 2011-03-08 04:42:40 +0000 @@ -1,3 +1,8 @@ +2011-03-08 Arni Magnusson (tiny change) + + * textmodes/texinfo.el (texinfo-environments): + Add deftypecv, deftypeivar, deftypemethod, deftypeop, html. (Bug#2783) + 2011-03-08 Glenn Morris * cus-start.el (cursor-in-non-selected-windows): === modified file 'lisp/textmodes/texinfo.el' --- lisp/textmodes/texinfo.el 2011-01-25 04:08:28 +0000 +++ lisp/textmodes/texinfo.el 2011-03-08 04:42:40 +0000 @@ -318,11 +318,12 @@ (defconst texinfo-environments '("cartouche" "copying" "defcv" "deffn" "defivar" "defmac" - "defmethod" "defop" "defopt" "defspec" "deftp" "deftypefn" - "deftypefun" "deftypevar" "deftypevr" "defun" "defvar" + "defmethod" "defop" "defopt" "defspec" "deftp" "deftypecv" + "deftypefn" "deftypefun" "deftypeivar" "deftypemethod" + "deftypeop" "deftypevar" "deftypevr" "defun" "defvar" "defvr" "description" "detailmenu" "direntry" "display" "documentdescription" "enumerate" "example" "flushleft" - "flushright" "format" "ftable" "group" "ifclear" "ifset" + "flushright" "format" "ftable" "group" "html" "ifclear" "ifset" "ifhtml" "ifinfo" "ifnothtml" "ifnotinfo" "ifnotplaintext" "ifnottex" "ifplaintext" "iftex" "ignore" "itemize" "lisp" "macro" "menu" "multitable" "quotation" "smalldisplay" ------------------------------------------------------------ revno: 103587 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-03-07 20:34:31 -0800 message: cus-start.el fix for bug#8192. * lisp/cus-start.el (cursor-in-non-selected-windows): Fix :set quoting oddness. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-08 04:28:14 +0000 +++ lisp/ChangeLog 2011-03-08 04:34:31 +0000 @@ -1,5 +1,8 @@ 2011-03-08 Glenn Morris + * cus-start.el (cursor-in-non-selected-windows): + Fix :set quoting oddness. (Bug#8192) + * font-lock.el (lisp-font-lock-keywords-1): Don't highlight `)' in some setf expressions. (Bug#2159) === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2011-01-26 20:02:07 +0000 +++ lisp/cus-start.el 2011-03-08 04:34:31 +0000 @@ -111,9 +111,9 @@ (cursor-in-non-selected-windows cursor boolean nil :tag "Cursor In Non-selected Windows" - :set #'(lambda (symbol value) - (set-default symbol value) - (force-mode-line-update t))) + :set (lambda (symbol value) + (set-default symbol value) + (force-mode-line-update t))) (transient-mark-mode editing-basics boolean nil :standard (not noninteractive) :initialize custom-initialize-delay ------------------------------------------------------------ revno: 103586 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-03-07 20:31:57 -0800 message: Doc fix for bug#8193. * doc/emacs/display.texi (Optional Mode Line): Don't mention exactly where display-time appears (it was wrong anyway). diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-03-06 18:24:11 +0000 +++ doc/emacs/ChangeLog 2011-03-08 04:31:57 +0000 @@ -1,3 +1,8 @@ +2011-03-08 Glenn Morris + + * display.texi (Optional Mode Line): Don't mention exactly where + display-time appears. (Bug#8193) + 2011-03-06 Chong Yidong * search.texi (Isearch Yank): C-y now bound to isearch-yank-kill. === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/display.texi 2011-03-08 04:31:57 +0000 @@ -999,8 +999,7 @@ Emacs can optionally display the time and system load in all mode lines. To enable this feature, type @kbd{M-x display-time} or customize the option @code{display-time-mode}. The information added to the mode -line usually appears after the buffer name, before the mode names and -their parentheses. It looks like this: +line looks like this: @example @var{hh}:@var{mm}pm @var{l.ll} ------------------------------------------------------------ revno: 103585 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-03-07 20:28:14 -0800 message: font-lock.el tweak for bug#2159. * lisp/font-lock.el (lisp-font-lock-keywords-1): Don't highlight `)' in some setf expressions. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-08 02:49:20 +0000 +++ lisp/ChangeLog 2011-03-08 04:28:14 +0000 @@ -1,3 +1,8 @@ +2011-03-08 Glenn Morris + + * font-lock.el (lisp-font-lock-keywords-1): Don't highlight `)' + in some setf expressions. (Bug#2159) + 2011-03-08 Chong Yidong * custom.el (custom-available-themes): Return themes in === modified file 'lisp/font-lock.el' --- lisp/font-lock.el 2011-01-25 04:08:28 +0000 +++ lisp/font-lock.el 2011-03-08 04:28:14 +0000 @@ -2242,7 +2242,7 @@ "\\)\\)\\>" ;; Any whitespace and defined object. "[ \t'\(]*" - "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?") + "\\(setf[ \t]+\\sw+\\|\\sw+\\)?") (1 font-lock-keyword-face) (9 (cond ((match-beginning 3) font-lock-function-name-face) ((match-beginning 6) font-lock-variable-name-face) ------------------------------------------------------------ revno: 103584 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-03-07 21:49:20 -0500 message: * lisp/custom.el (custom-available-themes): Return themes in alphabetical order. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-07 20:29:03 +0000 +++ lisp/ChangeLog 2011-03-08 02:49:20 +0000 @@ -1,3 +1,8 @@ +2011-03-08 Chong Yidong + + * custom.el (custom-available-themes): Return themes in + alphabetical order. + 2011-03-07 Chong Yidong * progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect === modified file 'lisp/custom.el' --- lisp/custom.el 2011-02-01 17:34:07 +0000 +++ lisp/custom.el 2011-03-08 02:49:20 +0000 @@ -1219,7 +1219,7 @@ (setq sym (intern (match-string 1 file))) (custom-theme-name-valid-p sym) (push sym themes))))) - (delete-dups themes))) + (nreverse (delete-dups themes)))) (defun custom-theme--load-path () (let (lpath) ------------------------------------------------------------ revno: 103583 author: Kristoffer Grönlund committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-03-07 21:47:55 -0500 message: * etc/themes/wombat-theme.el: New file. Also, add Lisp file tails to tsdh-*-theme.el. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-03-06 02:43:19 +0000 +++ etc/ChangeLog 2011-03-08 02:47:55 +0000 @@ -1,3 +1,7 @@ +2011-03-08 Kristoffer Grönlund + + * themes/wombat-theme.el: New file. + 2011-03-06 Juanma Barranquero * srecode/el.srt: Fix typo. === modified file 'etc/themes/tsdh-dark-theme.el' --- etc/themes/tsdh-dark-theme.el 2011-01-16 20:02:27 +0000 +++ etc/themes/tsdh-dark-theme.el 2011-03-08 02:47:55 +0000 @@ -58,3 +58,9 @@ '(window-number-face ((t (:foreground "red" :weight bold))))) (provide-theme 'tsdh-dark) + +;; Local Variables: +;; no-byte-compile: t +;; End: + +;;; tsdh-dark-theme.el ends here === modified file 'etc/themes/tsdh-light-theme.el' --- etc/themes/tsdh-light-theme.el 2011-01-16 20:02:27 +0000 +++ etc/themes/tsdh-light-theme.el 2011-03-08 02:47:55 +0000 @@ -57,3 +57,10 @@ '(window-number-face ((t (:foreground "red" :weight bold))))) (provide-theme 'tsdh-light) + + +;; Local Variables: +;; no-byte-compile: t +;; End: + +;;; tsdh-light-theme.el ends here === added file 'etc/themes/wombat-theme.el' --- etc/themes/wombat-theme.el 1970-01-01 00:00:00 +0000 +++ etc/themes/wombat-theme.el 2011-03-08 02:47:55 +0000 @@ -0,0 +1,108 @@ +;;; wombat-theme.el --- Custom face theme for Emacs + +;; Copyright (C) 2011 Free Software Foundation, Inc. + +;; Author: Kristoffer Grönlund + +;; 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 . + +;;; Code: + +(deftheme wombat + "Theme for faces, using easy-on-the eyes colors on a dark gray background. +Adapted, with permission, from a Vim color scheme by Lars H. Nielsen. +Basic, Font Lock, Isearch, Gnus, Message, and Ansi-Color faces +are included.") + +(let ((class '((class color) (min-colors 89)))) + (custom-theme-set-faces + 'wombat + `(default ((,class (:background "#242424" :foreground "#f6f3e8")))) + `(cursor ((,class (:background "#656565" :foreground "#f6f3e8")))) + ;; Highlighting faces + `(fringe ((,class (:background "#303030")))) + `(highlight ((,class (:background "#454545" :foreground "#ffffff" + :underline t)))) + `(region ((,class (:background "#444444" :foreground "#f6f3e8")))) + `(secondary-selection ((,class (:background "#333366" :foreground "#f6f3e8")))) + `(isearch ((,class (:background "#343434" :foreground "#857b6f")))) + `(lazy-highlight ((,class (:background "#384048" :foreground "#a0a8b0")))) + ;; Mode line faces + `(mode-line ((,class (:background "#444444" :foreground "#f6f3e8")))) + `(mode-line-inactive ((,class (:background "#444444" :foreground "#857b6f")))) + ;; Escape and prompt faces + `(minibuffer-prompt ((,class (:foreground "#e5786d")))) + `(escape-glyph ((,class (:foreground "#ddaa6f" :weight bold)))) + ;; Font lock faces + `(font-lock-builtin-face ((,class (:foreground "#e5786d")))) + `(font-lock-comment-face ((,class (:foreground "#99968b")))) + `(font-lock-constant-face ((,class (:foreground "#e5786d")))) + `(font-lock-function-name-face ((,class (:foreground "#cae682")))) + `(font-lock-keyword-face ((,class (:foreground "#8ac6f2" :weight bold)))) + `(font-lock-string-face ((,class (:foreground "#95e454")))) + `(font-lock-type-face ((,class (:foreground "#92a65e" :weight bold)))) + `(font-lock-variable-name-face ((,class (:foreground "#cae682")))) + `(font-lock-warning-face ((,class (:foreground "#ccaa8f")))) + ;; Button and link faces + `(link ((,class (:foreground "#8ac6f2" :underline t)))) + `(link-visited ((,class (:foreground "#e5786d" :underline t)))) + `(button ((,class (:background "#333333" :foreground "#f6f3e8")))) + `(header-line ((,class (:background "#303030" :foreground "#e7f6da")))) + ;; Gnus faces + `(gnus-group-news-1 ((,class (:weight bold :foreground "#95e454")))) + `(gnus-group-news-1-low ((,class (:foreground "#95e454")))) + `(gnus-group-news-2 ((,class (:weight bold :foreground "#cae682")))) + `(gnus-group-news-2-low ((,class (:foreground "#cae682")))) + `(gnus-group-news-3 ((,class (:weight bold :foreground "#ccaa8f")))) + `(gnus-group-news-3-low ((,class (:foreground "#ccaa8f")))) + `(gnus-group-news-4 ((,class (:weight bold :foreground "#99968b")))) + `(gnus-group-news-4-low ((,class (:foreground "#99968b")))) + `(gnus-group-news-5 ((,class (:weight bold :foreground "#cae682")))) + `(gnus-group-news-5-low ((,class (:foreground "#cae682")))) + `(gnus-group-news-low ((,class (:foreground "#99968b")))) + `(gnus-group-mail-1 ((,class (:weight bold :foreground "#95e454")))) + `(gnus-group-mail-1-low ((,class (:foreground "#95e454")))) + `(gnus-group-mail-2 ((,class (:weight bold :foreground "#cae682")))) + `(gnus-group-mail-2-low ((,class (:foreground "#cae682")))) + `(gnus-group-mail-3 ((,class (:weight bold :foreground "#ccaa8f")))) + `(gnus-group-mail-3-low ((,class (:foreground "#ccaa8f")))) + `(gnus-group-mail-low ((,class (:foreground "#99968b")))) + `(gnus-header-content ((,class (:foreground "#8ac6f2")))) + `(gnus-header-from ((,class (:weight bold :foreground "#95e454")))) + `(gnus-header-subject ((,class (:foreground "#cae682")))) + `(gnus-header-name ((,class (:foreground "#8ac6f2")))) + `(gnus-header-newsgroups ((,class (:foreground "#cae682")))) + ;; Message faces + `(message-header-name ((,class (:foreground "#8ac6f2" :weight bold)))) + `(message-header-cc ((,class (:foreground "#95e454")))) + `(message-header-other ((,class (:foreground "#95e454")))) + `(message-header-subject ((,class (:foreground "#cae682")))) + `(message-header-to ((,class (:foreground "#cae682")))) + `(message-cited-text ((,class (:foreground "#99968b")))) + `(message-separator ((,class (:foreground "#e5786d" :weight bold)))))) + +(custom-theme-set-variables + 'wombat + '(ansi-color-names-vector ["#242424" "#e5786d" "#95e454" "#cae682" + "#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"])) + +(provide-theme 'wombat) + +;; Local Variables: +;; no-byte-compile: t +;; End: + +;;; wombat-theme.el ends here ------------------------------------------------------------ revno: 103582 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2011-03-08 02:52:20 +0100 message: src/w32xfns.c (select_palette): Check success of RealizePalette against GDI_ERROR, not zero. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-07 21:16:42 +0000 +++ src/ChangeLog 2011-03-08 01:52:20 +0000 @@ -1,3 +1,8 @@ +2011-03-08 Juanma Barranquero + + * w32xfns.c (select_palette): Check success of RealizePalette against + GDI_ERROR, not zero. + 2011-03-07 Ben Key * w32fns.c (FILE_NAME_COMBO_BOX, FILE_NAME_LIST): Define. === modified file 'src/w32xfns.c' --- src/w32xfns.c 2011-01-25 04:08:28 +0000 +++ src/w32xfns.c 2011-03-08 01:52:20 +0000 @@ -97,7 +97,7 @@ else f->output_data.w32->old_palette = NULL; - if (RealizePalette (hdc)) + if (RealizePalette (hdc) != GDI_ERROR) { Lisp_Object frame, framelist; FOR_EACH_FRAME (framelist, frame) ------------------------------------------------------------ revno: 103581 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-03-07 19:08:03 -0500 message: Mention elpa branch in admin/notes/BRANCH; clarify admin/notes/elpa. diff: === modified file 'admin/notes/BRANCH' --- admin/notes/BRANCH 2010-04-15 17:22:07 +0000 +++ admin/notes/BRANCH 2011-03-08 00:08:03 +0000 @@ -23,3 +23,10 @@ If you are looking at this file in a branch other than the trunk, there may be some branch-specific documentation below this line. ________________________________________________________________________ + +* elpa + + This branch does not contain a copy of Emacs, but of the Emacs Lisp + package archive (elpa.gnu.org). See admin/notes/elpa for further + explanation, and the README file in the branch for usage + instructions. === modified file 'admin/notes/elpa' --- admin/notes/elpa 2010-11-04 17:00:43 +0000 +++ admin/notes/elpa 2011-03-08 00:08:03 +0000 @@ -1,42 +1,24 @@ NOTES ON THE EMACS PACKAGE ARCHIVE -Here are instructions on uploading files to the package archive at -elpa.gnu.org, for Emacs maintainers. (If you are not a maintainer, -contact us if you want to submit a package.) - -1. You will need login access to elpa.gnu.org. You will also need to - get the FSF sysadmins to allow ssh access through the FSF firewall - for your local machine. Ensure that your uid, USER, is in the - `elpa' group on elpa.gnu.org; this gives you write access to the - bzr repository from which the packages are managed. - -2. Go to your bzr repository on your local machine. Of, if you don't - have one (you should, if you're tracking Emacs bzr), make one: - - cd $DEVHOME - bzr init-repo elpa/ - cd elpa - - Create a branch for elpa: - - bzr branch bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo package-repo - - Bind the branch: - - cd package-repo/ - echo "public_branch = bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo" >> .bzr/branch/branch.conf - bzr bind bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo - - Now you should be able to do `bzr up' and `bzr commit'. - -3. Changes in bzr do not immediately propagate to the user-facing tree - (i.e., what users see when they do `M-x list-packages'). That tree - is created by a (daily) cron job that does "bzr export". If for - some reason you need to refresh the user-facing tree immediately, - run /home/elpa/bin/package-update.sh as the "elpa" user. - - The Org mode dailies are not part of the repository. After the - package-update.sh script creates the user-facing tree, it copies - the daily tarfile hosted on orgmode.org directly into that tree. - -4. FIXME: How to actually upload a package file. +The GNU Emacs package archive, at elpa.gnu.org, is managed using Bzr. +The Bzr branch is hosted on Savannah, and you can check it out with + + bzr branch bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa elpa + +Changes made to this branch propagate to elpa.gnu.org as follows. +There exists a copy of the elpa branch on that machine. Someone with +access must log in, pull the latest changes from Savannah, and run a +"deployment" script that generates the content at the web-visible +location http://elpa.gnu.org/packages. + +The reason things are set up this way, instead of using the package +upload utilities in package-x.el, is so that Emacs hackers can easily +edit the contents of the Savannah "elpa" branch, with the aid of +version control. (For instance, multi-file packages are stored on the +Bzr branch in source form, not as tarfiles.) Because deployment is a +semi-manual process, this allows us some flexibility in making changes +to the branch on Savannah. Furthermore, one can use the elpa branch +to deploy a "local" copy of the package archive, for testing. + +For details on how to use the elpa branch, see that README file in +that branch. ------------------------------------------------------------ revno: 103580 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2011-03-07 22:16:42 +0100 message: Remove unnecessary "(tiny change)" markers. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-03-03 07:00:23 +0000 +++ lib-src/ChangeLog 2011-03-07 21:16:42 +0000 @@ -119,7 +119,7 @@ ($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)): Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h. -2011-02-21 Ben Key (tiny change) +2011-02-21 Ben Key * make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to the new BVAR macro. === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-07 21:11:24 +0000 +++ src/ChangeLog 2011-03-07 21:16:42 +0000 @@ -152,7 +152,7 @@ as per recent filemodestring API change. Reported by Jonas Öster in . -2011-02-23 Ben Key (tiny change) +2011-02-23 Ben Key * nsterm.m (ns_draw_window_cursor): Obey the cursor_width argument directly, for bar cursors. ------------------------------------------------------------ revno: 103579 author: Ben Key committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2011-03-07 22:11:24 +0100 message: Fix bug#8181. * src/w32fns.c (FILE_NAME_COMBO_BOX, FILE_NAME_LIST): Define. (file_dialog_callback): Fix locating the window handle of the File Name text field. After disabling it, set focus on the list control. (Fx_file_dialog): If only_dir_p is non-nil, set the text of the File Name text field to "Current Directory" if it does not already have another value. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-07 09:00:11 +0000 +++ src/ChangeLog 2011-03-07 21:11:24 +0000 @@ -1,3 +1,12 @@ +2011-03-07 Ben Key + + * w32fns.c (FILE_NAME_COMBO_BOX, FILE_NAME_LIST): Define. + (file_dialog_callback): Fix locating the window handle of the File Name + text field. After disabling it, set focus on the list control. + (Fx_file_dialog): If only_dir_p is non-nil, set the text of the File + Name text field to "Current Directory" if it does not already have + another value. (Bug#8181) + 2011-03-07 Adrian Robert * nsterm.m (ns_draw_window_cursor): Fix handling of "cursor_width" === modified file 'src/w32fns.c' --- src/w32fns.c 2011-02-16 18:39:46 +0000 +++ src/w32fns.c 2011-03-07 21:11:24 +0000 @@ -60,6 +60,8 @@ #include #include #define FILE_NAME_TEXT_FIELD edt1 +#define FILE_NAME_COMBO_BOX cmb13 +#define FILE_NAME_LIST lst1 #include "font.h" #include "w32font.h" @@ -5868,13 +5870,37 @@ { HWND dialog = GetParent (hwnd); HWND edit_control = GetDlgItem (dialog, FILE_NAME_TEXT_FIELD); - - /* Directories is in index 2. */ + HWND list = GetDlgItem (dialog, FILE_NAME_LIST); + + /* At least on Windows 7, the above attempt to get the window handle + to the File Name Text Field fails. The following code does the + job though. Note that this code is based on my examination of the + window hierarchy using Microsoft Spy++. bk */ + if (edit_control == NULL) + { + HWND tmp = GetDlgItem (dialog, FILE_NAME_COMBO_BOX); + if (tmp) + { + tmp = GetWindow (tmp, GW_CHILD); + if (tmp) + edit_control = GetWindow (tmp, GW_CHILD); + } + } + + /* Directories is in index 2. */ if (notify->lpOFN->nFilterIndex == 2) { CommDlg_OpenSave_SetControlText (dialog, FILE_NAME_TEXT_FIELD, "Current Directory"); EnableWindow (edit_control, FALSE); + /* Note that at least on Windows 7, the above call to EnableWindow + disables the window that would ordinarily have focus. If we + do not set focus to some other window here, focus will land in + no man's land and the user will be unable to tab through the + dialog box (pressing tab will only result in a beep). + Avoid that problem by setting focus to the list here. */ + if (CDN_INITDONE == notify->hdr.code) + SetFocus (list); } else { @@ -5951,6 +5977,13 @@ else filename[0] = '\0'; + /* The code in file_dialog_callback that attempts to set the text + of the file name edit window when handling the CDN_INITDONE + WM_NOTIFY message does not work. Setting filename to "Current + Directory" in the only_dir_p case here does work however. */ + if (filename[0] == 0 && ! NILP (only_dir_p)) + strcpy (filename, "Current Directory"); + { NEWOPENFILENAME new_file_details; BOOL file_opened = FALSE; ------------------------------------------------------------ revno: 103578 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-03-07 15:29:03 -0500 message: Fix a cc-cmds.el patch from acm that I applied incorrectly (Bug#7595). * lisp/progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect application of patch from Alan Mackenzie (Bug#7595). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-07 12:03:22 +0000 +++ lisp/ChangeLog 2011-03-07 20:29:03 +0000 @@ -1,3 +1,8 @@ +2011-03-07 Chong Yidong + + * progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect + application of patch from Alan Mackenzie (Bug#7595). + 2011-03-07 Deniz Dogan * net/rcirc.el (rcirc-connect): Fix PASS bug. === modified file 'lisp/progmodes/cc-cmds.el' --- lisp/progmodes/cc-cmds.el 2011-02-20 18:36:29 +0000 +++ lisp/progmodes/cc-cmds.el 2011-03-07 20:29:03 +0000 @@ -2564,19 +2564,12 @@ ;; Are we about to move backwards into or out of a ;; preprocessor command? If so, locate its beginning. (when (eq (cdr res) 'macro-boundary) - (setq macro-fence - (save-excursion - (if macro-fence - (progn - (end-of-line) - (and (not (eobp)) - (progn (c-skip-ws-forward) - (c-beginning-of-macro)) - (progn (c-end-of-macro) - (point)))) - (and (not (eobp)) - (c-beginning-of-macro) - (progn (c-end-of-macro) (point))))))) + (save-excursion + (beginning-of-line) + (setq macro-fence + (and (not (bobp)) + (progn (c-skip-ws-backward) (c-beginning-of-macro)) + (point))))) ;; Are we about to move backwards into a literal? (when (memq (cdr res) '(macro-boundary literal)) (setq range (c-ascertain-preceding-literal))) ------------------------------------------------------------ revno: 103577 committer: Deniz Dogan branch nick: emacs-trunk timestamp: Mon 2011-03-07 13:03:22 +0100 message: * lisp/net/rcirc.el (rcirc-connect): Fix PASS bug. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-07 08:56:30 +0000 +++ lisp/ChangeLog 2011-03-07 12:03:22 +0000 @@ -1,3 +1,7 @@ +2011-03-07 Deniz Dogan + + * net/rcirc.el (rcirc-connect): Fix PASS bug. + 2011-03-07 Glenn Morris * vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt. === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2011-03-05 15:40:50 +0000 +++ lisp/net/rcirc.el 2011-03-07 12:03:22 +0000 @@ -548,7 +548,7 @@ (add-hook 'auto-save-hook 'rcirc-log-write) ;; identify - (when password + (unless (zerop (length password)) (rcirc-send-string process (concat "PASS " password))) (rcirc-send-string process (concat "NICK " nick)) (rcirc-send-string process (concat "USER " user-name ------------------------------------------------------------ revno: 103576 committer: Adrian Robert branch nick: trunk timestamp: Mon 2011-03-07 11:00:11 +0200 message: * nsterm.m (ns_draw_window_cursor): Fix handling of 'cursor_width' parameter for hbar cursors. Based on a patch by Ben Key . diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-06 23:19:25 +0000 +++ src/ChangeLog 2011-03-07 09:00:11 +0000 @@ -1,3 +1,9 @@ +2011-03-07 Adrian Robert + + * nsterm.m (ns_draw_window_cursor): Fix handling of "cursor_width" + parameter for hbar cursors. Based on a patch by Ben Key + . + 2011-03-06 Chong Yidong * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 === modified file 'src/nsterm.m' --- src/nsterm.m 2011-03-05 23:55:43 +0000 +++ src/nsterm.m 2011-03-07 09:00:11 +0000 @@ -2235,7 +2235,7 @@ -------------------------------------------------------------------------- */ { NSRect r, s; - int fx, fy, h; + int fx, fy, h, cursor_height; struct frame *f = WINDOW_XFRAME (w); struct glyph *phys_cursor_glyph; int overspill; @@ -2279,13 +2279,20 @@ get_phys_cursor_geometry (w, glyph_row, phys_cursor_glyph, &fx, &fy, &h); /* The above get_phys_cursor_geometry call set w->phys_cursor_width - to the glyph width; replace with CURSOR_WIDTH for bar cursors. */ - if (cursor_type == BAR_CURSOR || cursor_type == HBAR_CURSOR) + to the glyph width; replace with CURSOR_WIDTH for (V)BAR cursors. */ + if (cursor_type == BAR_CURSOR) { if (cursor_width < 1) cursor_width = max (FRAME_CURSOR_WIDTH (f), 1); w->phys_cursor_width = cursor_width; } + /* If we have an HBAR, "cursor_width" MAY specify height. */ + else if (cursor_type == HBAR_CURSOR) + { + cursor_height = (cursor_width < 1) ? lrint (0.25 * h) : cursor_width; + fy += h - cursor_height; + h = cursor_height; + } r.origin.x = fx, r.origin.y = fy; r.size.height = h; @@ -2337,10 +2344,7 @@ [FRAME_CURSOR_COLOR (f) set]; break; case HBAR_CURSOR: - s = r; - s.origin.y += lrint (0.75 * s.size.height); - s.size.height = lrint (s.size.height * 0.25); - NSRectFill (s); + NSRectFill (r); break; case BAR_CURSOR: s = r; ------------------------------------------------------------ revno: 103575 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-03-07 00:56:30 -0800 message: vc.el fix for bug#6146. * lisp/vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt. Give an explicit error if failed to make writable. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-07 08:39:43 +0000 +++ lisp/ChangeLog 2011-03-07 08:56:30 +0000 @@ -1,6 +1,7 @@ 2011-03-07 Glenn Morris * vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt. + Give an explicit error if failed to make writable. (Bug#6146) 2011-03-07 Ed Reingold === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2011-03-07 08:39:43 +0000 +++ lisp/vc/vc.el 2011-03-07 08:56:30 +0000 @@ -1117,7 +1117,10 @@ ;; Make the file+buffer read-write. (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) (error "Aborted")) - (set-file-modes file (logior (file-modes file) 128)) + ;; Maybe we somehow lost permissions on the directory. + (condition-case nil + (set-file-modes file (logior (file-modes file) 128)) + (error (error "Unable to make file writable"))) (let ((visited (get-file-buffer file))) (when visited (with-current-buffer visited ------------------------------------------------------------ revno: 103574 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-03-07 00:39:43 -0800 message: * lisp/vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-07 07:48:32 +0000 +++ lisp/ChangeLog 2011-03-07 08:39:43 +0000 @@ -1,3 +1,7 @@ +2011-03-07 Glenn Morris + + * vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt. + 2011-03-07 Ed Reingold * calendar/cal-hebrew.el (diary-hebrew-yahrzeit): === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2011-03-05 21:56:00 +0000 +++ lisp/vc/vc.el 2011-03-07 08:39:43 +0000 @@ -1115,7 +1115,7 @@ (dolist (file files) (unless (file-writable-p file) ;; Make the file+buffer read-write. - (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue?" file)) + (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) (error "Aborted")) (set-file-modes file (logior (file-modes file) 128)) (let ((visited (get-file-buffer file))) ------------------------------------------------------------ revno: 103573 author: Ed Reingold committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-03-06 23:48:32 -0800 message: cal-hebrew addition from bug#8190. * lisp/calendar/cal-hebrew.el (diary-hebrew-yahrzeit): Add optional `after-sunset' argument. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-07 07:35:25 +0000 +++ lisp/ChangeLog 2011-03-07 07:48:32 +0000 @@ -1,3 +1,8 @@ +2011-03-07 Ed Reingold + + * calendar/cal-hebrew.el (diary-hebrew-yahrzeit): + Add optional `after-sunset' argument. (Bug#8190) + 2011-03-07 Aaron S. Hawley * play/morse.el (nato-alphabet, nato-region, denato-region): === modified file 'lisp/calendar/cal-hebrew.el' --- lisp/calendar/cal-hebrew.el 2011-03-01 03:53:18 +0000 +++ lisp/calendar/cal-hebrew.el 2011-03-07 07:48:32 +0000 @@ -879,21 +879,27 @@ (declare-function diary-ordinal-suffix "diary-lib" (n)) ;;;###diary-autoload -(defun diary-hebrew-yahrzeit (death-month death-day death-year &optional mark) +(defun diary-hebrew-yahrzeit (death-month death-day death-year + &optional mark after-sunset) "Yahrzeit diary entry--entry applies if date is Yahrzeit or the day before. Parameters are DEATH-MONTH, DEATH-DAY, DEATH-YEAR; the diary entry is assumed to be the name of the person. Although the date of death is specified by the civil calendar, the proper Hebrew calendar Yahrzeit is determined. +If the death occurred after local sunset on the given civil date, +the following civil date corresponds to the Hebrew date of +death--set the optional parameter AFTER-SUNSET non-nil in this case. + The order of the input parameters changes according to `calendar-date-style' \(e.g. to DEATH-DAY, DEATH-MONTH, DEATH-YEAR in the European style). An optional parameter MARK specifies a face or single-character string to use when highlighting the day in the calendar." (let* ((h-date (calendar-hebrew-from-absolute - (calendar-absolute-from-gregorian - (diary-make-date death-month death-day death-year)))) + (+ (calendar-absolute-from-gregorian + (diary-make-date death-month death-day death-year)) + (if after-sunset 1 0)))) (h-month (calendar-extract-month h-date)) (h-day (calendar-extract-day h-date)) (h-year (calendar-extract-year h-date))