Summary for the impatient:
-1. Don't add code to Emacs written by someone other than yourself
-without thinking about the legal aspect. Even if the changes are
-trivial, consider if they combine with previous changes by the same
-author to make a non-trivial total. If so, make sure they have an
-assignment. If adding a whole file adjust the copyright statements in
-the file.
-
-2. When installing code written by someone else, the ChangeLog entry
-should be in the name of the author of the code, not the person who
-installs it. I think it is helpful to put the author (if not yourself)
-in the CVS log as well; and to not install any of your own changes in
-the same commit.
-
-3. With images, add the legal info to a README file in the directory
+1. Don't add a file to Emacs written by someone other than yourself
+without thinking about the legal aspect (make sure they have an
+assignment, adjust the copyright statements in the file). NB the
+ChangeLog entry should be in the name of the author of the code, not
+the person who installs it.
+
+2. With images, add the legal info to a README file in the directory
containing the image.
-4. If you add a lot of text to a previously trivial file that had no
+3. If you add a lot of text to a previously trivial file that had no
legal notices, consider if you should add a copyright statement.
-5. Please don't just add an FSF copyright without checking that is the
+4. Please don't just add an FSF copyright without checking that is the
right thing to do.
src/m/news-r6.h
public domain, leave alone.
-etc/BABYL, ms-kermit
- no notices (see below).
-
etc/edt-user.doc
- update BOTH notices in this file
etc/emacs.csh
- - written by Michael DeCorte, who has no assignment. But trivial
- enough to not need license.
+ - keep simple license for this simple file
etc/future-bug
- doesn't need a humourless disclaimer, because Karl Fogel says we
licenses that they have. They are distributed with Emacs but they
are not part of Emacs."
-etc/HELLO
- standard notices. Just a note that although the file itself is not
- really copyrightable, in the wider context of it being part of
- Emacs (and written by those with assignments), a standard notice is
- fine.
-
etc/MAILINGLISTS
rms: simple license is fine for this file
** Some notes on resolved issues, for historical information only
-etc/TERMS
-rms: "surely written either by me or by ESR. (If you can figure out
-which year, I can probably tell you which.) Either way, we have papers
-for it." Present in Emacs-16.56 (15-jul-85).
-
-etc/ulimit.hack
- Very obsolete file removed March 2007. Doesn't say who the author
-is, but web-search suggests Karl Kleinpaste, who has no Emacs
-assignment. Trivial anyway.
-http://groups.google.com/group/comp.unix.shell/browse_thread/thread/bf3df496994\
-9f1df/7e5922c67b3a98fb
-http://groups.google.com/group/comp.unix.questions/msg/cc7e49cacfd1ccb4
- (original 1987 source)
-
lisp/term/README
- had no copyright notice till Feb 2007. ChangeLog.3 suggests it was
written by Eric Raymond. When asked by rms on 14 Feb 2007 he said:
admin/check-doc-strings
File says it's in the public domain, but that might not make it so.
-etc/BABYL
- File written long ago by authors with no assignment. Keep them
- without notices for now, try and contact authors if possible. Be
- ready to remove these files if the authors ever object.
-etc/ms-kermit
etc/e/eterm-color.ti
src/acldef.h, chpdef.h, ndir.h
On legal advice from Matt Norwood, the following comment was added
- to these files in Feb/Mar 2007:
+ to these files in Feb 2007:
The code here is forced by the interface, and is not subject to
copyright, constituting the only possible expression of the
and possibly add a list of all authors who have changed these files.
(details in email from Matt Norwood to rms, 2007/02/03).
-etc/ms-7bkermit
- Says it was written by Andy Lowry and Joel Spolsky. No entry for
-either in copyright.list. NB this file is not "constrained" like
-ms-kermit (rms: "We know it isn't. A comment at the front says it has
-other bindings which might be handy."). File removed March 2007.
-Re-add if clear up status at some point.
-
-etc/Xkeymap.txt
- No info on author. File removed March 2007. rms: "It says it is
-RLK's way of remapping his keyboard, so it is not constrained. I think
-it was written by RLK. Let's delete it; if we contact RLK again, we
-can put it back."
-
src/m/mips4.h, news-risc.h, pmax.h
src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h,
noted in this file.
+etc/BABYL
+ File says it was written in 1983 by Eugene Ciccarelli, who has no
+ assignment. RMS: "The lawyer said we can keep BABYL."
+
+
REMOVED etc/gnu.xpm, nt/icons/emacs21.ico, nt/icons/sink.ico
- Restore if find legal info. emacs21.ico is not due to Davenport.
Voelker could not immediately recall anything, but will check and
*** These are copyright issues still to be addressed:
-Do we need an assignment from Kevin Rodgers? (rms)
+
+etc/ms-kermit - no copyright, but ms-7bkermit has one
\f
-2007-03-11 Glenn Morris <rgm@gnu.org>
-
- * ms-7bkermit, ulimit.hack, Xkeymap.txt: Remove files.
-
- * Makefile (SOURCES): ulimit.hack is removed.
-
-2007-03-04 David Kastrup <dak@gnu.org>
-
- * NEWS (fontification): Mention that the new default for
- jit-lock-stealth-time is now nil.
-
2007-03-01 Kim F. Storm <storm@cua.dk>
* ORDERS: Reformat text.
* NEWS.21, NEWS.20: ... new files for Emacs 21 and Emacs 20 news.
* ONEWS, ONEWS.1, ONEWS.2, ONEWS.3, ONEWS.4: Remove (rename) files ...
* NEWS.19, NEWS.18, NEWS.1-17: ... and organize news about older Emacs
- versions in separate files. Update copyright notices.
+ versions in separte files. Update copyright notices.
2006-06-03 Eli Zaretskii <eliz@gnu.org>
-rm -f DOC* core *.dvi *.log
SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* etags.* ledit.l ms-* \
- spook-lines tasks.texi termcap.* *.tex
+ spook-lines tasks.texi termcap.* ulimit.hack *.tex
unlock:
chmod u+w $(SOURCES)
### emacs.csh
+## Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+## Free Software Foundation, Inc.
+
## Author: Michael DeCorte
+## COPYING PERMISSIONS:
+
+## Permission is hereby granted, free of charge, to any person
+## obtaining a copy of this file, to deal in the file without
+## restriction, including without limitation the rights to use, copy,
+## modify, merge, publish, distribute, sublicense, and/or sell copies
+## of the file, and to permit persons to whom the file is furnished to
+## do so, subject to the following condition:
+##
+## The above copyright notice and this permission notice shall be
+## included in all copies or substantial portions of the file.
+
### Commentary:
## This defines a csh command named `edit' which resumes an
-2007-03-11 Richard Stallman <rms@gnu.org>
-
- * emacs-lisp/bytecomp.el (byte-compile-warning-prefix):
- Correctly compute line number.
-
-2007-03-11 Guanpeng Xu <herberteuler@hotmail.com>
-
- * type-break.el (type-break-get-previous-count):
- Repeat previous change here.
-
-2007-03-11 Dan Nicolaescu <dann@ics.uci.edu>
-
- * progmodes/grep.el (grep-find-ignored-directories): Add .git and
- .bzr to list.
-
-2007-03-11 Andreas Schwab <schwab@suse.de>
-
- * diff-mode.el (diff-apply-hunk): Use proper format string for
- error.
-
-2007-03-11 Stefan Monnier <monnier@iro.umontreal.ca>
-
- * mail/emacsbug.el (report-emacs-bug): Don't hard code the "X" name.
-
-2007-03-10 Chong Yidong <cyd@stupidchicken.com>
-
- * faces.el (face-set-after-frame-default): Recalculate face
- customizations after applying X resources.
-
-2007-03-10 Ryan Yeske <rcyeske@gmail.com>
-
- * net/rcirc.el (rcirc-timeout-seconds): New variable.
- (rcirc-keepalive-seconds): Remove variable.
- (rcirc-server-name, rcirc-timeout-timer, rcirc-connecting)
- (rcirc-process, rcirc-user-disconnect): New variables.
- (rcirc-connect): Initalize new variables.
- (rcirc-keepalive): Don't send keepalive pings before connection
- is completed.
- (rcirc-sentinel): Do mark all channels with activity when
- connection is dropped. Run hook with process buffer local.
- (rcirc-reschedule-timeout, rcirc-delete-process): New functions.
- (rcirc-buffer-process): Return value of rcirc-process if
- rcirc-server-buffer is nil.
- (rcirc-server-name): Return the reported server name.
- (rcirc-update-prompt): Simplify computation of the server name.
- (rcirc-format-response-string): Likewise.
- (rcirc-handler-001): Mark server as connected, record the reported
- server name, and schedule a timeout.
- (rcirc-track-nick): Add a spec for the tty class.
- (rcirc-user-non-nick): Remove function.
- (rcirc-nick-prefix-chars): Add variable.
- (rcirc-user-nick): Use above variable.
-
-2007-03-10 Johan Bockg\e,be\e(Brd <bojohan@dd.chalmers.se>
-
- * icomplete.el (icomplete-tidy, icomplete-exhibit):
- Bind deactivate-mark to nil.
-
-2007-03-10 Martin Rudalics <rudalics@gmx.at>
-
- * complete.el (PC-do-completion): Bind dirlength to nil to avoid
- that buffer contents get erased during completion.
-
-2007-03-10 Glenn Morris <rgm@gnu.org>
-
- * woman.el (woman-change-fonts): Add a hack to deal with
- font-escape followed by "." at start of a line.
- (woman2-IP): Add a hack to deal with consecutive requests.
- (woman2-tagged-paragraph): Extend existing hack to handle "sp".
-
-2007-03-10 Alan Mackenzie <acm@muc.de>
-
- * progmodes/cc-mode.el (c-before-change): Wrap in save-match-data.
-
-2007-03-09 Richard Stallman <rms@gnu.org>
-
- * abbrev.el (abbrev): Add `provide'.
-
-2007-03-09 Thien-Thi Nguyen <ttn@gnu.org>
-
- * net/ange-ftp.el (ange-ftp-try-passive-mode): Doc fix.
-
-2007-03-09 Martin Rudalics <rudalics@gmx.at>
-
- * complete.el (PC-try-completion): New function.
- (PC-do-completion, read-file-name-internal): Use it instead of
- try-completion.
-
-2007-03-08 Alan Mackenzie <acm@muc.de>
-
- Remove stale tokens from `c-found-types' cache.
-
- * progmodes/cc-mode.el (c-unfind-enclosing-token)
- (c-unfind-coalesced-tokens, c-before-change): New functions.
- (c-maybe-stale-found-type): New variable.
-
- * progmodes/cc-engine.el (c-partial-ws-p, c-unfind-type)
- (c-trim-found-types): New functions.
-
-2007-03-08 Stefan Monnier <monnier@iro.umontreal.ca>
-
- * smerge-mode.el (smerge-remove-props): Don't mark the buffer modified.
- (debug-ignored-errors): Add entry from smerge-match-conflict.
-
-2007-03-08 J.D. Smith <jdsmith@as.arizona.edu>
-
- * progmodes/idlw-help.el (idlwave-do-context-help1): Don't visit
- special help topics for keywords.
- (idlwave-help-assistant-command): Include ".exe" for ms-dos
- etc. Assistant command.
-
-2007-03-08 Chong Yidong <cyd@stupidchicken.com>
-
- * replace.el (occur-engine): Move buffer-undo-list binding...
- (occur-1): ...to here.
-
- * complete.el (PC-bindings): Rebind M-TAB in read-expression-map.
-
- * simple.el (minibuffer-completing-symbol): New var.
- (eval-expression): Use it.
- (completion-setup-function): Don't bind completion-base-size when
- completing a symbol in the minibuffer.
-
-2007-03-08 Nick Roberts <nickrob@snap.net.nz>
-
- * progmodes/gud.el (gdb): Pop up current GUD buffer if user
- tries to start a second session in graphical mode.
-
-2007-03-07 Miles Bader <miles@gnu.org>
-
- * international/isearch-x.el
- (isearch-process-search-multibyte-characters):
- Strip text-properties from PROMPT to avoid an error from read-string.
-
-2007-03-07 Kim F. Storm <storm@cua.dk>
-
- * complete.el (PC-bindings): Remap lisp-complete-symbol to
- PC-lisp-complete-symbol instead of binding M-TAB in global-map.
-
-2007-03-07 Micha\e,Ak\e(Bl Cadilhac <michael@cadilhac.name>
-
- * complete.el (PC-do-completion): Delete duplicates in the list of
- possible completions.
-
-2007-03-07 Glenn Morris <rgm@gnu.org>
-
- * ses.el (ses-mode): Doc fix.
-
-2007-03-06 Kim F. Storm <storm@cua.dk>
-
- * isearch.el (isearch-message-prefix): Undo 2007-03-01 change.
-
-2007-03-06 Kenichi Handa <handa@m17n.org>
-
- * term/x-win.el (x-select-utf8-or-ctext): Improve the strategy.
-
-2007-03-06 Stefan Monnier <monnier@iro.umontreal.ca>
-
- * simple.el (completion-setup-function): Improve last fix so it doesn't
- set it to a relative directory name either.
-
-2007-03-05 Vinicius Jose Latorre <viniciusjl@ig.com.br>
-
- * ps-print.el: Replace some (defvar VAR) by (defvar VAR nil).
-
-2007-03-05 Richard Stallman <rms@gnu.org>
-
- * emacs-lisp/re-builder.el (reb-re-syntax): Fix custom type.
-
- * files.el (find-file-noselect): No error if file no longer exists.
- Display a message and avoid other questions.
-
-2007-03-05 Stefan Monnier <monnier@iro.umontreal.ca>
-
- * pcomplete.el (pcomplete-show-completions): Improve last change, so
- as not to use an invisible window and to create a window if none exist.
-
- * progmodes/python.el (python-send-command): Restart proc if necessary.
- (python-proc): Simplify.
-
-2007-03-05 David Hansen <david.hansen@gmx.net> (tiny change)
-
- * pcomplete.el (pcomplete-show-completions): Search all frames for
- completions buffer.
-
-2007-03-05 Chong Yidong <cyd@stupidchicken.com>
-
- * cus-edit.el (customize-save-variable): Clear customized-value
- property (saved values are now put in theme-value property).
- (customize-set-variable): Doc fix.
-
- * complete.el (PC-do-completion): If completion-ignore-case is
- non-nil, replace field with completion string before exiting.
-
-2007-03-05 Michael Albinus <michael.albinus@gmx.de>
-
- * net/tramp.el (tramp-make-temp-file): New parameter FILENAME.
- Append its extension to the resulting temporary file name.
- (tramp-handle-file-local-copy, tramp-handle-write-region): Apply it.
-
- * net/tramp-smb.el (tramp-smb-handle-file-local-copy)
- (tramp-smb-handle-write-region): Apply it.
-
-2007-03-05 Alin C. Soare <alinsoar@voila.fr> (tiny change)
-
- * emacs-lisp/lisp-mode.el (calculate-lisp-indent):
- Redo previous change.
-
-2007-03-04 Kevin Rodgers <kevin.d.rodgers@gmail.com>
-
- * diff-mode.el (diff-mode): Doc fix.
-
-2007-03-05 Kenichi Handa <handa@m17n.org>
-
- * international/characters.el: Set category `l' (latin)
- for more characters.
-
-2007-03-04 Kim F. Storm <storm@cua.dk>
-
- * emacs-lisp/authors.el (authors-aliases): Add alias.
-
-2007-03-04 Glenn Morris <rgm@gnu.org>
-
- * progmodes/hideshow.el (hs-minor-mode): Turn mode off and show
- all when switching major mode.
- (hs-minor-mode, hs-c-start-regexp, hs-block-start-regexp)
- (hs-block-start-mdata-select, hs-block-end-regexp)
- (hs-forward-sexp-func, hs-adjust-block-beginning):
- Do not make these variables permanent-local.
-
-2007-03-04 Richard Stallman <rms@gnu.org>
-
- * progmodes/cperl-mode.el (cperl-mode):
- Modify cperl-compilation-error-regexp-alist by appending.
-
- * emacs-lisp/edebug.el (edebug-kill-buffer): New function.
- (edebug-mode): Add the hook.
- (edebug-recursive-edit): Remove the hook on exiting.
-
- * type-break.el (type-break-get-previous-time):
- Handle end-of-file errors specially
- so they don't get reported wrong in .emacs.
-
- * startup.el (fancy-splash-text): Clarify text.
-
- * simple.el (beginning-of-buffer, end-of-buffer):
- Avoid treating plain C-u like numeric arg.
-
- * simple.el (completion-setup-function): Don't set
- default-directory to nil.
-
- * shell.el (shell-dirstack-query): Doc fix.
-
- * mouse.el (mouse-drag-mode-line-1, mouse-drag-vertical-line):
- Don't select the window -- pass it to primitives instead.
-
- * faces.el (minibuffer-prompt): Use medium blue by default.
-
-2007-03-04 David Kastrup <dak@gnu.org>
-
- * jit-lock.el (jit-lock-stealth-time): Change default to nil.
- Preserve 16 as default value for "seconds" when customizing.
-
-2007-03-04 Carsten Dominik <dominik@science.uva.nl>
-
- * textmodes/org.el (org-self-insert-command)
- (orgtbl-self-insert-command, org-delete-char)
- (org-delete-backward-char): Set the `flyspell-delayed' property.
-
2007-03-03 Chong Yidong <cyd@stupidchicken.com>
* international/mule.el (find-auto-coding): Don't search for
2007-02-26 Andrey Zhdanov <susuman@hotmail.com> (tiny change)
- * progmodes/gud.el (gud-pdb-marker-regexp): Add optional <module>
- keyword for Python 2.5.
+ (gud-pdb-marker-regexp): Add optional <module> keyword for Python 2.5.
2007-02-26 Romain Francoise <romain@orebokech.com>
(org-table-toggle-coordinate-overlays): New functions.
(org-table-overlay-coordinates, org-table-coordinate-overlays):
New variables.
- (org-startup-with-deadline-check): Remove option.
+ (org-startup-with-deadline-check): Option removed.
(org-mode): Remove deadline check on startup.
- (org-table-limit-column-width): Remove option.
- (org-table-formula-numbers-only): Remove option.
- (org-link-style, org-link-format): Remove options.
- (org-select-agenda-window, org-fit-agenda-window): Remove options.
+ (org-table-limit-column-width): Option removed.
+ (org-table-formula-numbers-only): Option removed.
+ (org-link-style, org-link-format): Options removed.
+ (org-select-agenda-window, org-fit-agenda-window): Options removed.
(org-export-ascii-show-new-buffer)
- (org-export-html-show-new-buffer): Remove options.
- (org-activate-links): Remove camel option.
- (org-file-link-context-use-camel-case): Remove option.
- (org-camel-regexp): Remove variable.
- (org-activate-camels): Remove function.
- (org-store-link): Remove Camel stuff.
- (org-make-org-heading-camel): Remove function.
- (org-open-at-point): Remove camel stuff.
- (org-link-search): Remove camel stuff.
+ (org-export-html-show-new-buffer): Options removed.
+ (org-activate-links): Camel option removed.
+ (org-file-link-context-use-camel-case): Option removed.
+ (org-camel-regexp): Veriable removed.
+ (org-activate-camels): Function removed.
+ (org-store-link): Removed Camel stuff.
+ (org-make-org-heading-camel): Function removed.
+ (org-open-at-point): Removed camel stuff.
+ (org-link-search): Removed camel stuff.
(org-camel-to-words): Function removed.
(org-get-agenda-file-buffer): Make sure we prepare the base
buffers, not any indirect buffers.
(org-sort-entries): Sort top-level when not on a headline, and no
active region.
(org-in-regexp): New function.
- (org-search-not-self): Rename from `org-search-not-link'.
+ (org-search-not-self): Renamed from `org-search-not-link'.
(org-open-link-marker): New variable.
(org-open-at-point): Set `org-open-link-marker'.
- (org-print-icalendar-entries): Fixe bug with excluding DONE
+ (org-print-icalendar-entries): Fixed bug with excluding DONE
entries from the exported list.
(org-edit-formula-lisp-indent): New command.
(orgtbl-to-texinfo, orgtbl-to-html): New functions.
(org-upgrade-old-links)
(org-table-modify-formulas, org-table-replace-in-formulas)
(org-table-find-dataline)
- (org-table-get-vertical-vector): Remove functions.
+ (org-table-get-vertical-vector): Functions removed.
(org-table-remove-rectangle-highlight)
(org-time-stamp-format, org-toggle-log-option)
(org-table-highlight-rectangle)
(org-table-edit-scroll, org-table-edit-scroll-down)
(org-set-frame-title, org-show-reference)
(org-unhighlight-once, org-verify-change-for-undo): New functions.
- (org-show-variable): Remove command.
+ (org-show-variable): Command removed.
(org-add-log-maybe): New arguments STATE, FINDPOS
- (org-table-sort-lines): Rewrite from scratch.
+ (org-table-sort-lines): Rewritten from scratch.
(org-link-search): New argument AVOID-POS.
- (org-print-icalendar-entries): Remove argument CATEGORY.
- (org-run-agenda-series): Remove argument WONDOW.
+ (org-print-icalendar-entries): Argument CATEGORY removed.
+ (org-run-agenda-series): Argument WONDOW removed.
(org-next-link, org-previous-link): New commands.
(org-agenda-date-format): New option.
(org-table-iterate): New command.
(org-table-modify-formulas)
- (org-table-replace-in-formulas): Remove functions.
+ (org-table-replace-in-formulas): Functions removed.
(org-table-fix-formulas): New function.
(org-table-insert-column, org-table-delete-column)
(org-table-move-column): Use `org-table-fix-formulas'.
(org-read-date): Accept "+N" as input for a date relative to the
current date.
(org-remove-subtree-entries-from-agenda): New function.
- (org-agenda-archive, org-agenda-kill):
- Use `org-remove-subtree-entries-from-agenda'.
+ (org-agenda-archive, org-agenda-kill): Use
+ `org-remove-subtree-entries-from-agenda'.
(org-do-sort, org-sort-entries): New functions.
(org-sort): New command.
(org-table-sort-lines): Use `org-do-sort'.
(org-table-number-regexp): Require 0x... to identify as number
in tables.
(org-startup-options): New keywords for note taking.
- (org-upgrade-old-links): Remove function.
+ (org-upgrade-old-links): Function removed.
(org-get-repeat): New function.
(org-show-context): Also show siblings on current level.
(org-show-siblings): New function.
* pgg-gpg.el (pgg-gpg-process-region): Make USE-AGENT nil
if PASSPHRASE is given.
-2007-02-17 Chris Moore <dooglus@gmail.com>
+2007-02-17 Chris Moore <dooglus@gmail.com>
* jka-cmpr-hook.el (jka-compr-compression-info-list):
Recognize backups of bz2 compressed files.
2007-01-03 Alan Mackenzie <acm@muc.de>
- * progmode/cc-cmds.el (c-mask-paragraph): Fix yesterday's buggy patch.
+ * progmode/cc-cmds.el (c-mask-paragraph): Fix yesterday's buggy
+ patch.
2007-01-03 Chris Moore <christopher.ian.moore@gmail.com>
* progmodes/cc-defs.el (c-emacs-features): Don't assume point-min==1.
-2005-12-06 Nozomu Ando <nand@mac.com>
+2005-12-06 Nozomu Ando <nand@mac.com> (tiny patch)
* mail/smtpmail.el (smtpmail-try-auth-methods): Make password
prompts work for AUTH PLAIN. Also reported by Steve Allan
* progmodes/python.el (python-close-block-statement-p)
(python-outdent-p, python-current-defun): Use symbol-end.
-2005-03-25 Karl Chen <quarl@cs.berkeley.edu>
+2005-03-25 Karl Chen <quarl@cs.berkeley.edu> (tiny change)
* files.el (save-some-buffers): Doc fix.
* electric.el (Electric-pop-up-window): Use fit-window-to-buffer
instead of calculating the right size.
-2005-01-02 Karl Chen <quarl@cs.berkeley.edu>
+2005-01-02 Karl Chen <quarl@cs.berkeley.edu> (tiny change)
* vc-svn.el (vc-svn-diff): Stay local if possible.
(define-derived-mode diff-mode fundamental-mode "Diff"
"Major mode for viewing/editing context diffs.
Supports unified and context diffs as well as (to a lesser extent)
-normal diffs. If you edit the buffer manually, diff-mode will try
-to update the hunk headers for you on-the-fly.
-
+normal diffs.
When the buffer is read-only, the ESC prefix is not necessary.
If you edit the buffer manually, diff-mode will try to update the hunk
headers for you on-the-fly.
You can also switch between context diff and unified diff with \\[diff-context->unified],
or vice versa with \\[diff-unified->context] and you can also reverse the direction of
a diff with \\[diff-reverse-direction].
-
-When the buffer is read-only, the Meta- modifier is not necessary
-to run the Diff mode commands:
-
- \\{diff-mode-map}"
-
+\\{diff-mode-map}"
(set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
(set (make-local-variable 'outline-regexp) diff-outline-regexp)
(set (make-local-variable 'imenu-generic-expression)
(yes-or-no-p (format "Really apply this hunk to %s? "
(file-name-nondirectory
buffer-file-name)))))))
- (error "%s"
- (substitute-command-keys
+ (error (substitute-command-keys
(format "Use %s\\[diff-apply-hunk] to apply it to the other file"
(if (not reverse) "\\[universal-argument] ")))))
((and switched
(pos (if (and byte-compile-current-file
(integerp byte-compile-read-position))
(with-current-buffer byte-compile-current-buffer
- (format "%d:%d:"
- (save-excursion
- (goto-char byte-compile-last-position)
- (1+ (count-lines (point-min) (point-at-bol))))
+ (format "%d:%d:" (count-lines (point-min)
+ byte-compile-last-position)
(save-excursion
(goto-char byte-compile-last-position)
(1+ (current-column)))))
(insert "\n\nIn " (emacs-version) "\n")
(if (fboundp 'x-server-vendor)
(condition-case nil
- ;; This is used not only for X11 but also W32 and others.
- (insert "Windowing system distributor `" (x-server-vendor)
- "', version "
+ (insert "X server distributor `" (x-server-vendor) "', version "
(mapconcat 'number-to-string (x-server-version) ".") "\n")
(error t)))
(if (and system-configuration-options
(provide 'emacsbug)
-;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49
+;;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49
;;; emacsbug.el ends here
:type 'alist
:group 'grep)
-(defcustom grep-find-ignored-directories '("CVS" ".svn" "{arch}" ".hg" "_darcs"
- ".git" ".bzr")
+(defcustom grep-find-ignored-directories '("CVS" ".svn" "{arch}" ".hg" "_darcs")
"*List of names of sub-directories which `rgrep' shall not recurse into."
:type '(repeat string)
:group 'grep)
(with-current-buffer occur-buf
(occur-mode)
- (let ((inhibit-read-only t)
- ;; Don't generate undo entries for creation of the initial contents.
- (buffer-undo-list t))
+ (let ((inhibit-read-only t))
(erase-buffer)
(let ((count (occur-engine
regexp active-bufs occur-buf
title-face prefix-face match-face keep-props)
(with-current-buffer out-buf
(let ((globalcount 0)
+ ;; Don't generate undo entries for creation of the initial contents.
+ (buffer-undo-list t)
(coding nil))
;; Map over all the buffers
(dolist (buf buffers)
(if file
(timep ;; returns expected format, else nil
(with-current-buffer (find-file-noselect file 'nowarn)
- (condition-case nil
- (save-excursion
- (goto-char (point-min))
- (read (current-buffer)))
- (end-of-file
- (error "End of file in `%s'" file))))))))
+ (save-excursion
+ (goto-char (point-min))
+ (read (current-buffer))))))))
(defun type-break-get-previous-count ()
"Get previous keystroke count from `type-break-file-name'.
(setq file
(with-current-buffer
(find-file-noselect file 'nowarn)
- (condition-case nil
- (save-excursion
- (goto-char (point-min))
- (forward-line 1)
- (read (current-buffer)))
- (end-of-file
- (error "End of file in `%s'" file)))))))
+ (save-excursion
+ (goto-char (point-min))
+ (forward-line 1)
+ (read (current-buffer)))))))
file
0)))
-2007-03-11 Sam Steingold <sds@gnu.org>
-
- * process.c (sigchld_handler): Sleep before wait3 to avoid a busyloop.
-
-2007-03-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
-
- * macfns.c (Fx_server_vendor): Change vendor string to "Apple Inc.".
-
-2007-03-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
-
- * macterm.c [USE_CARBON_EVENTS] (mac_handle_mouse_event): Ignore
- mouse wheel movement on title bar or tool bar.
-
-2007-03-10 Chong Yidong <cyd@stupidchicken.com>
-
- * keyboard.c (help_form_saved_window_configs): New var.
- (read_char_help_form_unwind): New function.
- (read_char): Don't restore window configuration if a mouse click
- arrives while the help form is being displayed.
-
-2007-03-10 Kim F. Storm <storm@cua.dk>
-
- * xdisp.c (redisplay_window): Don't automatically select a new window
- start for a contination line during mouse-click.
-
-2007-03-09 Jan Dj\e,Ad\e(Brv <jan.h.d@swipnet.se>
-
- * xterm.c (handle_one_xevent): Ignore buttons > 3 for the tool bar.
-
-2007-03-09 Juanma Barranquero <lekktu@gmail.com>
-
- * keymap.c (Fdescribe_buffer_bindings): Check that BUFFER is valid.
-
-2007-03-08 Richard Stallman <rms@gnu.org>
-
- * keyboard.c (syms_of_keyboard): Doc fix.
-
-2007-03-08 Chong Yidong <cyd@stupidchicken.com>
-
- * minibuf.c (Ftry_completion): Don't short circuit if
- completion-ignore-case is non-nil.
-
-2007-03-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
-
- * macfns.c (mac_set_scroll_bar_width, mac_frame_parm_handlers):
- Undo 2006-03-06 changes.
-
- * macterm.c (XTset_vertical_scroll_bar) [MAC_OSX]: Don't show scroll
- bar if its width is smaller than that of Aqua small scroll bar.
-
-2007-03-07 Stefan Monnier <monnier@iro.umontreal.ca>
-
- * minibuf.c (read_minibuf): Bind inhibit-read-only a bit longer so as
- to handle correctly prompts with read-only property.
-
-2007-03-06 Jan Dj\e,Ad\e(Brv <jan.h.d@swipnet.se>
-
- * sound.c (wav_play): Check header->data_length to see how much we
- shall read.
- (alsa_period_size): Convert ALSA period size in frames to bytes.
- (alsa_write): Return if frames is zero.
-
-2007-03-06 Kenichi Handa <handa@m17n.org>
-
- * xselect.c (Vselection_coding_system): Documentation improved.
-
-2007-03-05 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
-
- * macterm.c (x_scroll_bar_create, XTread_socket): Replace #if
- USE_TOOLKIT_SCROLL_BARS with #ifdef USE_TOOLKIT_SCROLL_BARS.
- (x_set_window_size): Call SET_FRAME_GARBAGED. Clear window if
- internal border width has changed.
-
- * macterm.h (struct mac_output): New member `internal_border_width'.
-
-2007-03-04 Richard Stallman <rms@gnu.org>
-
- * window.c (Fdisplay_buffer): Doc fix.
-
2007-03-03 Glenn Morris <rgm@gnu.org>
* Makefile.in: Don't clear out LIB_X11_LIB, since XFT_LIBS does
not include -lX11 on Solaris.
-2007-03-02 Stuart D. Herring <herring@lanl.gov>
+2007-03-02 Stuart D. Herring <herring@lanl.gov>
- * keymap.c (Fkey_binding): Don't consider one-element lists as events.
+ * keymap.c (Fkey_binding): Don't consider two-element lists as
+ events.
2007-03-01 Kenichi Handa <handa@m17n.org>
(x_scroll_bar_create, XTset_vertical_scroll_bar)
[USE_TOOLKIT_SCROLL_BARS]: Initialize bar->min_handle.
- * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
- New member `min_handle'.
+ * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: New
+ member `min_handle'.
2007-02-23 Kim F. Storm <storm@cua.dk>
(mac_flush_display_optional) [USE_CG_DRAWING]: New function.
(x_redisplay_interface) [USE_CG_DRAWING]: Set it as handler for
flush_display_optional.
- [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press):
- New argument MOUSE_POS. All uses changed. Set bar->dragging to
+ [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press): New
+ argument MOUSE_POS. All uses changed. Set bar->dragging to
negative integer if scroll bar handle is pressed.
- [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release):
- Negative bar->dragging means scroll bar handle is not dragged.
+ [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release): Negative
+ bar->dragging means scroll bar handle is not dragged.
[USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_drag): Get initial
offset of scroll bar handle from negative bar->dragging.
(XTread_socket) [USE_TOOLKIT_SCROLL_BARS]: Modifiers for scroll
* w32menu.c (current_popup_menu): Make available globally.
(menubar_selection_callback): Free menu strings before pushing the
- menu event into the keyboard buffer. Remove menu_command_in_progress.
+ menu event into the keyboard buffer. Remove
+ menu_command_in_progress.
* w32fns.c (current_popup_menu): Use from w32menu.c.
(w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: Use menubar_active
2007-01-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
- * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]:
- Use DisableControl for disabled items. Set default button to first
+ * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]: Use
+ DisableControl for disabled items. Set default button to first
enabled one. Use icon of application in execution.
2007-01-13 Eli Zaretskii <eliz@gnu.org>
#endif /* not MAC_OSX */
}
+void
+mac_set_scroll_bar_width (f, arg, oldval)
+ struct frame *f;
+ Lisp_Object arg, oldval;
+{
+#ifdef MAC_OSX
+ if (INTEGERP (arg) && XINT (arg) > 0)
+ {
+ if (XINT (arg) < (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH
+ + MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH) / 2)
+ XSETINT (arg, MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH);
+ else
+ XSETINT (arg, MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH);
+ }
+#endif
+ x_set_scroll_bar_width (f, arg, oldval);
+}
+
static void
mac_set_font (f, arg, oldval)
struct frame *f;
(display)
Lisp_Object display;
{
- return build_string ("Apple Inc.");
+ return build_string ("Apple Computers");
}
DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0,
x_set_menu_bar_lines,
x_set_mouse_color,
x_explicitly_set_name,
- x_set_scroll_bar_width,
+ mac_set_scroll_bar_width,
x_set_title,
x_set_unsplittable,
x_set_vertical_scroll_bars,
#define WUNTRACED 0
#endif /* no WUNTRACED */
/* Keep trying to get a status until we get a definitive result. */
- while (1) {
- errno = 0;
- pid = wait3 (&w, WNOHANG | WUNTRACED, 0);
- if (! (pid < 0 && errno == EINTR))
- break;
- /* avoid a busyloop: wait3 is a system call, so we do not want
- to prevent the kernel from actually sending SIGCHLD to emacs
- by asking for it all the time */
- sleep (1);
- }
+ do
+ {
+ errno = 0;
+ pid = wait3 (&w, WNOHANG | WUNTRACED, 0);
+ }
+ while (pid < 0 && errno == EINTR);
if (pid <= 0)
{
projects / emacs.git / commitdiff