Commit graph

546 commits

Author SHA1 Message Date
Bastien Guerry
04c285b264 Fixes related to the last Org merge. 2013-01-08 23:02:09 +01:00
Bastien Guerry
2e3c2398e3 Merge Org up to commit 4cac75153. Some ChangeLog formatting fixes. 2013-01-08 19:49:37 +01:00
Bastien Guerry
6d3e4c8092 Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog. 2013-01-08 16:31:30 +01:00
Bastien Guerry
c7cf0ebc24 Merge Org 7.9.3 (commit 31c1aea) 2013-01-08 15:27:18 +01:00
Glenn Morris
0a8bf3afca Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org 2013-01-02 18:37:57 -08:00
Glenn Morris
b8573968d8 Add 2013 to yet more FSF copyright years 2013-01-02 17:46:47 -08:00
Paul Eggert
0877d0dc24 Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca 2013-01-02 08:13:04 -08:00
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Glenn Morris
d5e5e7b411 Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org 2012-12-30 10:09:01 -08:00
Glenn Morris
c88943a2a4 ChangeLog fix
remove dupe, mark tiny change by author without assignment
http://orgmode.org/w/?p=org-mode.git;a=patch;h=ae87b6e5f2a143bb69ab512515dc85b41ff0cd1e
2012-12-27 00:25:30 -08:00
Michael Albinus
006faa4118 * ob.el (org-babel-temp-file): Fix setting of
`temporary-file-directory' on remote hosts.

* ob-eval.el (org-babel-shell-command-on-region): Use
`process-file' instead of `call-process-region'.  The latter one
does not work on remote hosts.
2012-12-20 14:15:43 +01:00
Glenn Morris
727f973937 Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org 2012-12-12 21:29:15 -08:00
Bastien Guerry
63aa098259 Merge upstream Org (from commit 488eea) 2012-12-12 17:47:07 +01:00
Chong Yidong
770de7cf72 Obsolete longlines.el.
* longlines.el: Move to obsolete/.

* lisp/org/org-bibtex.el (org-bibtex-ask): Use visual-line-mode instead of
longlines-mode.

* lisp/vc/ediff-diff.el (ediff-extract-diffs, ediff-extract-diffs3):
Remove code referring to longlines mode.
2012-12-04 10:47:43 +08:00
Bastien Guerry
00323fb326 Fix overwritten typos and Org version number. 2012-10-26 17:27:29 +02:00
Bastien Guerry
bdebdb64b3 Merge upstream Org (from commit acbbe2) 2012-10-26 16:42:05 +02:00
Chong Yidong
576978b400 Revert last change to org-lparse.el 2012-10-25 02:16:41 +08:00
Jambunathan K
c28885aede Fix error in previous merge from Org.
* lisp/org/org-lparse.el: Move some hooks from org-lparse to
org-do-lparse.

Fixes: debbugs:12718
2012-10-24 23:04:12 +08:00
Paul Eggert
735135f9bc Spelling fixes. 2012-10-04 22:57:24 -07:00
Bastien Guerry
c6ea35a7a8 Remove duplicate ChangeLog entry.
Thanks to Glenn Morris for pointing at this.
2012-10-01 07:41:14 +02:00
Bastien Guerry
8223b1d233 Sync Org 7.9.2 from the commit tagged "release_7.9.2" in Org's Git repo. 2012-09-30 17:14:59 +02:00
Glenn Morris
74bfe42a98 Standardize some license notices 2012-09-24 08:58:20 -07:00
Paul Eggert
0e23ef9dde Better seed support for (random).
* doc/lispref/numbers.texi (Random Numbers): Document new behavior of
the calls (random) and (random STRING).
* etc/NEWS: Document new behavior of (random), (random "string").
* lisp/play/5x5.el, lisp/play/animate.el, lisp/play/cookie1.el:
* lisp/play/dissociate.el, lisp/play/doctor.el, lisp/play/dunnet.el:
* lisp/play/gomoku.el, lisp/play/landmark.el, lisp/play/mpuz.el:
* lisp/play/tetris.el, lisp/play/zone.el:
* lisp/calc/calc-comb.el (math-init-random-base):
* lisp/play/blackbox.el (bb-init-board):
* lisp/play/life.el (life):
* lisp/server.el (server-use-tcp):
* lisp/type-break.el (type-break):
Remove unnecessary call to (random t).
* lisp/net/sasl.el (sasl-unique-id-function):
Change (random t) to (random), now that the latter is more random.
* lisp/play/life.el (life-initialized): Remove no-longer-needed var.
* lisp/gnus/gnus-sync.el (gnus-sync-lesync-setup):
* lisp/gnus/message.el (message-canlock-generate, message-unique-id):
Change (random t) to (random), now that the latter is more random.
* lisp/org/org-id.el (org-id-uuid):
Change (random t) to (random), now that the latter is more random.
* src/emacs.c (main): Call init_random.
* src/fns.c (Frandom): Set the seed from a string argument, if given.
Remove long-obsolete Gentzel cruft.
* src/lisp.h, src/sysdep.c (seed_random): Now takes address and size, not long.
(init_random): New function.
2012-08-31 18:04:26 -07:00
Paul Eggert
b46a6a83b3 Don't use the abbreviation "win" to refer to Windows (Bug#10421).
* lisp/org/ob-lilypond.el (ly-w32-ly-path): Rename from ly-win32-ly-path.
(ly-w32-pdf-path): Rename from ly-win32-pdf-path.
(ly-w32-midi-path): Rename from ly-win32-midi-path.
(ly-determine-ly-path, ly-determine-pdf-path, ly-determine-midi-path):
Check for "windows-nt", not "win32", in system-type.
* src/regex.c (MAX_BUF_SIZE): Remove some incorrect and
long-ago-commented-out code that talks about "WIN32".
* src/w32heap.h (OS_WINDOWS_95): Rename from OS_WIN95.
All uses changed.
2012-07-29 01:18:29 -07:00
Juanma Barranquero
ed9265fc7d Fix typos in ChangeLogs. 2012-07-14 04:08:32 +02:00
Paul Eggert
e3ac128172 Spelling fixes. 2012-07-02 01:00:05 -07:00
Paul Eggert
48d1354eb8 Spelling fixes. 2012-06-17 01:53:31 -07:00
Chong Yidong
3726946669 Remove incorrect uses of "modeline".
* ansi-color.el (ansi-color-faces-vector): Change default faces.

* cus-edit.el (mode-line):
* dframe.el (dframe-mouse-hscroll):
* emacs-lisp/re-builder.el:
* emacs-lisp/easy-mmode.el (define-minor-mode):
* frame.el (set-frame-name):
* help.el (lookup-minor-mode-from-indicator):
* net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name):
* progmodes/cc-cmds.el (c-toggle-auto-newline)
(c-toggle-hungry-state):
* progmodes/antlr-mode.el (antlr-language-alist):
* progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face):
* progmodes/vhdl-mode.el (vhdl-mode):
* progmodes/which-func.el (which-func, which-func-cleanup-function):
* term/ns-win.el (ns-face-at-pos):
* term/sup-mouse.el (sup-mouse-report):
* textmodes/flyspell.el (flyspell-mode-line-string):
* textmodes/ispell.el (ispell-highlight-face):
* textmodes/reftex-global.el:
* vc/vc-arch.el (vc-arch-mode-line-string):
* vc/vc-cvs.el (vc-cvs-mode-line-string):
* vc/vc-git.el (vc-git-mode-line-string):
* vc/vc-hooks.el (vc-display-status)
(vc-default-mode-line-string):
* vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes.

* dired.el (dired-sort-set-mode-line): Rename from
dired-sort-set-modeline.  All callers changed.

* foldout.el (foldout-mode-line-string): Rename from
foldout-modeline-string.  All callers changed.
(foldout-update-mode-line): Rename from foldout-update-modeline.

* strokes.el (strokes-lighter): Rename from
strokes-modeline-string.

* subr.el (redraw-modeline): Make into obsolete alias.

* calendar/timeclock.el (timeclock-mode-line-display): Rename from
timeclock-modeline-display.  Make old name an alias.
(timeclock-update-mode-line): Likewise.  All callers changed.
(timeclock-mode-line-display): No need to check before using
add-hook.
(timeclock-relative, timeclock-day-over-hook)
(timeclock-use-elapsed, timeclock-mode-string)
(timeclock-mode-line-display): Doc fix, "modeline" -> "mode line".

* emulation/crisp.el (crisp-mode-mode-line-string): Rename from
crisp-mode-modeline-string.

* erc-track.el (erc-track, erc-track-faces-priority-list)
(erc-track-faces-normal-list, erc-track-find-face)
(erc-track-modified-channels): Fix modeline -> mode line in docs.

* eshell/esh-mode.el (eshell-status-in-mode-line): Rename from
eshell-status-in-modeline.

* org-clock.el (org-clock-string-limit)
(org-clock-modeline-total, org-clock-task-overrun-text)
(org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line".

* play/solitaire.el (solitaire-build-mode-line): Rename from
solitaire-build-modeline.  All callers changed.

* play/zone.el (zone-hiding-mode-line): Rename from
zone-hiding-modeline.  All callers changed.
(zone): Remove unusued `modeline-hidden-level' property.

* progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from
xscheme-modeline-initialize.  All callers changed.

* textmodes/sgml-mode.el (html-face-tag-alist)
(html-tag-face-alist): Use mode-line face instead of obsolete
alias modeline.

Fixes: debbugs:10329
2012-06-02 18:56:09 +08:00
Paul Eggert
c846da4383 Spelling fixes. 2012-05-28 23:16:49 -07:00
Glenn Morris
33017fafd1 Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu@gmail.com 2012-05-26 18:06:44 -07:00
Bastien Guerry
ed7bebbb48 Add a forgotten lisp/org/ChangeLog entry. 2012-05-26 01:17:15 +02:00
Glenn Morris
a5532eb31e Fix typos in previous 2012-05-25 17:28:05 -04:00
Bastien Guerry
9893229fd6 Fix major bug in the Org>ODT exporter. 2012-05-25 23:09:08 +02:00
Bastien Guerry
2a88ee23db Merge Org 7.8.11 -- important bug fixes. 2012-05-25 09:39:32 +02:00
Bastien Guerry
eb2adf0a29 ob.el: Fix bug. 2012-05-16 23:53:39 +02:00
Bastien Guerry
8c8b834fa9 Merge Org 7.8.10 -- important bug fixes since Org 7.8.09. 2012-05-16 19:33:50 +02:00
Glenn Morris
0cd38783c0 Fix org-ctags.el change from trunk 2012-04-09T13:05:48Z!cyd@gnu.org
* lisp/org/org-ctags.el (org-ctags-new-topic-template):
Revert 2012-04-09 removal of * from defcustom value, not doc.
2012-04-26 23:21:10 -07:00
Chong Yidong
a8e7d6d783 Merge changes from emacs-24 branch 2012-04-27 11:10:38 +08:00
Bastien Guerry
5e0e5e3676 org-ctags.el (org-ctags-new-topic-template): Fix the option default value back again.
This option was changed by error in this commit:
http://git.savannah.gnu.org/cgit/emacs.git/diff/lisp/org/org-protocol.el?h=emacs-24&id=0fc749f9

I first overwrote this change by error, then backported it
into Org git repo, then backported the error back into Emacs.

This is now fixed.
2012-04-26 22:46:10 +02:00
Glenn Morris
cdb45185ee ChangeLog fix 2012-04-26 14:57:49 -04:00
Bastien Guerry
2f885dcacb Sync with Org git commit 374c56b. 2012-04-26 19:30:04 +02:00
Bastien Guerry
3959f36938 lisp/org/ChangeLog: remove references to files that are not in the directory. 2012-04-26 18:57:34 +02:00
Bastien Guerry
d6d0cf1f18 Remove wrong ChangeLog entry in lisp/org/ChangeLog.
Thanks to Stephen Berman for pointing this.
2012-04-22 01:06:59 +02:00
Glenn Morris
35dc09a19c Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org 2012-04-13 18:46:06 -07:00
Bastien Guerry
801a68c874 Sync with Org 7.8.09 (bugfix release) 2012-04-11 12:59:50 +02:00
Chong Yidong
fb7ada5f94 Remove * characters from the front of variable docstrings. 2012-04-09 21:05:48 +08:00
Bastien Guerry
372d7b21b2 Add :version tag to new Org options in Emacs 24.1 2012-04-03 14:02:21 +02:00
Bastien Guerry
5c7ac47249 Fix small regressions in Org 2012-04-03 12:28:31 +02:00
Bastien Guerry
23f6720ebc Fix regressions in Org. 2012-04-02 17:42:03 +02:00
Paul Eggert
7bd20f915b Spelling fixes. 2012-04-01 17:43:32 -07:00