Re: /srv/bzr/emacs/emacs-24 r111150: Merge Org (commit c8c217)

Re: /srv/bzr/emacs/emacs-24 r111150: Merge Org (commit c8c217)

[Glenn Morris]

Thanks for merging it. Now the usual petty griping.. :)


Bastien Guerry wrote:

> -Copyright @copyright{} 2004--2013 Free Software Foundation, Inc.
> +Copyright @copyright{} 2004--2012 Free Software Foundation, Inc.

Wrong-o.

> === modified file 'lisp/org/ChangeLog'
> --- a/lisp/org/ChangeLog	2013-01-01 09:11:05 +0000
> +++ b/lisp/org/ChangeLog	2013-01-08 15:31:30 +0000
> @@ -1,3 +1,412 @@
> +2013-01-08  Achim Gratz  <Stromeko@Stromeko.de>
> +
> +	* org-compat.el (org-define-obsolete-function-alias)
> +	(org-define-obsolete-variable-alias): Introduce new compatibility
> +	macros to obsolete functions and variables.
> +
> +	* org-agenda.el, org-clock.el, org-id.el, org-lparse.el,
> +	org-protocol.el org.el: Use
> +	`org-define-obsolete-{function,variable}-alias' instead of
> +	`define-obsolate{function,variable}-alias'.
> +
> +	* org-faces.el: Define face alias mode-line for XEmacs (it's
> +	called modeline there).
> +
> +	* org-compat.el (org-condition-case-unless-debug): Do not use
> +	defalias for special forms, the Emacs 22 byte-compiler does not
> +	recognize them correctly when compiling macros.  Use a macro
> +	instead and rely on macro expansion.  That however makes the
> +	decision at compile time, which should be acceptable in this case
> +	since it only affects debugging.
> +
> +	* org-compat.el (org-no-popups): New wrapper macro which let-binds
> +	the correct variables to suppress popup windows depending on the
> +	Emacs version in use.  This is a compile-time decision when
> +	byte-compiling.
> +
> +	* org.el (org-get-location, org-switch-to-buffer-other-window):
> +	Use the wrapper `org-no-popups´ to let-bind the correct variables
> +	for suppression of popup windows.
> +
> +	* org-compat.el (user-error): Defalias to `error´ for Emacsen that
> +	don't have it.
> +
> +	* org-agenda.el (org-agenda-write): Use org-called-interactively-p
> +	instead of called-interactively-p.
> +
> +	* org.el (org-find-invisible-foreground): Do not use the value of
> +	variables `default-frame-alist´, `initial-frame-alist´ and
> +	`window-system-default-frame-alist´ when their symbol is not
> +	bound.


These changes don't seem to fix bugs and serve no purpose for the Org
mode that is distributed _with Emacs itself_. The only thing these could
possibly do at this stage is (inadvertently) introduce bugs in Emacs 24.3.
I'm not saying to remove the changes, just commenting that this is not
compatible with the emacs-24 policy.


ChangeLog formatting trivia (applies to several places):

>   * org-agenda.el (org-agenda-get-restriction-and-command): Use
>   `point-marker'.
>
>   * org-capture.el (org-capture-place-template): Ditto.
>
>   * org-colview-xemacs.el (org-dblock-write:columnview): Ditto.

Related changes should not be separated by blank lines.
Also, from admin/notes/changelogs:

    Preferred form for several entries with the same content:

    * help.el (view-lossage):
    * kmacro.el (kmacro-edit-lossage):
    * edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300 keys.

    (Rather than anything involving "ditto" and suchlike.)

> -\def\orgversionnumber{7.9.2}
> -\def\versionyear{2012}          % latest update
> -\input emacsver.tex
> +\def\orgversionnumber{7.9.3}
> +\def\versionyear{2013}          % latest update
> +\def\year{2013}                 % latest copyright year

That's an (undocumented) reversion of a prior Emacs change (the use of
emacsver.tex to set \year). I can understand the motivation, but it
leaves us with more places in Emacs where the copyright year needs to be
updated. If you don't want to copy emacsver.tex to the Org repo,
set-copyright in admin/admin.el will need a special entry for
orgcard.tex.

> +** No GPL manual anymore
> +
> +There used to be a GPL version of the Org manual, but this is not the
> +case anymore, the Free Software Foundation does not permit this.

I'd remove that statement from the version in Emacs I were you, because
that version has never been under GPL. Personally, I would find a more
neutral phrasing as well. Eg:

  The Org manual is no longer dual-licensed GPL and GFDL, but only GFDL.

(Since this is hiding a whole can of worms.)

> +The GNU FDL license is now included in the manual directly.

Not NEWS-worthy IMO.

Re: /srv/bzr/emacs/emacs-24 r111150: Merge Org (commit c8c217)

[Achim Gratz]

Glenn Morris writes:
> These changes don't seem to fix bugs and serve no purpose for the Org
> mode that is distributed _with Emacs itself_.

If you could say that these don't seem to have bug reports from users
that would be more agreeable to me.  They were all uncovered during
testing.

> The only thing these could possibly do at this stage is
> (inadvertently) introduce bugs in Emacs 24.3.  I'm not saying to
> remove the changes, just commenting that this is not compatible with
> the emacs-24 policy.

The fixes were done after asking whether they should be fixed and only
those few were done in maint (the branch that now merged into emacs-24)
that originated there.  If that's a problem we'd need to open a third
branch specifically for the Emacs merge when that time comes around next
time (and maybe back them out in emacs-24).


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada

Re: /srv/bzr/emacs/emacs-24 r111150: Merge Org (commit c8c217)

[Bastien]

Hi Glenn,

Glenn Morris <rgm@gnu.org> writes:

> Thanks for merging it. Now the usual petty griping.. :)

Thanks for your patience in double-checking this.

>> -Copyright @copyright{} 2004--2013 Free Software Foundation, Inc.
>> +Copyright @copyright{} 2004--2012 Free Software Foundation, Inc.
>
> Wrong-o.

Fixed.

> These changes don't seem to fix bugs and serve no purpose for the Org
> mode that is distributed _with Emacs itself_. The only thing these could
> possibly do at this stage is (inadvertently) introduce bugs in Emacs 24.3.
> I'm not saying to remove the changes, just commenting that this is not
> compatible with the emacs-24 policy.

Yes, I overlooked this while allowing the changes in Org's maint
branch.  All changes have been carefully tested though, and one can
argue (I won't personnally) that improving backward compatibility
with Emacs 22 is in the area of "bug fixing".

I'll be more restrictive next time.

> ChangeLog formatting trivia (applies to several places):
>
>>   * org-agenda.el (org-agenda-get-restriction-and-command): Use
>>   `point-marker'.
>>
>>   * org-capture.el (org-capture-place-template): Ditto.
>>
>>   * org-colview-xemacs.el (org-dblock-write:columnview): Ditto.
>
> Related changes should not be separated by blank lines.
> Also, from admin/notes/changelogs:
>
>     Preferred form for several entries with the same content:
>
>     * help.el (view-lossage):
>     * kmacro.el (kmacro-edit-lossage):
>     * edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300 keys.
>
>     (Rather than anything involving "ditto" and suchlike.)

I fixed the ChangeLog for this (only for 2013-01-08).

>> -\def\orgversionnumber{7.9.2}
>> -\def\versionyear{2012}          % latest update
>> -\input emacsver.tex
>> +\def\orgversionnumber{7.9.3}
>> +\def\versionyear{2013}          % latest update
>> +\def\year{2013}                 % latest copyright year
>
> That's an (undocumented) reversion of a prior Emacs change (the use of
> emacsver.tex to set \year). I can understand the motivation, but it
> leaves us with more places in Emacs where the copyright year needs to be
> updated. If you don't want to copy emacsver.tex to the Org repo,
> set-copyright in admin/admin.el will need a special entry for
> orgcard.tex.

Fixed, thanks.

>> +** No GPL manual anymore
>> +
>> +There used to be a GPL version of the Org manual, but this is not the
>> +case anymore, the Free Software Foundation does not permit this.
>
> I'd remove that statement from the version in Emacs I were you, because
> that version has never been under GPL. Personally, I would find a more
> neutral phrasing as well. Eg:
>
>   The Org manual is no longer dual-licensed GPL and GFDL, but only GFDL.
>
> (Since this is hiding a whole can of worms.)

Deleted, thanks.

>> +The GNU FDL license is now included in the manual directly.
>
> Not NEWS-worthy IMO.

Deleted too.

Thanks!

-- 
 Bastien

Re: /srv/bzr/emacs/emacs-24 r111150: Merge Org (commit c8c217)

[Xue Fuqiao]

On Tue, 08 Jan 2013 15:53:32 -0500
Glenn Morris <rgm@gnu.org> wrote:

> I'm not saying to remove the changes, just commenting that this is not
> compatible with the emacs-24 policy.

Where is the branch policy?  I cannot find it.
-- 
Best regards.

Re: /srv/bzr/emacs/emacs-24 r111150: Merge Org (commit c8c217)

[Bastien]

Xue Fuqiao <xfq.free@gmail.com> writes:

> On Tue, 08 Jan 2013 15:53:32 -0500
> Glenn Morris <rgm@gnu.org> wrote:
>
>> I'm not saying to remove the changes, just commenting that this is not
>> compatible with the emacs-24 policy.
>
> Where is the branch policy?  I cannot find it.

The emacs-24 branch is for bug fixes only.

I don't think there is information about this in the 
source code, but it was stated clearly on the mailing
list.

-- 
 Bastien

Re: /srv/bzr/emacs/emacs-24 r111150: Merge Org (commit c8c217)

[Xue Fuqiao]

On Tue, 08 Jan 2013 23:50:35 +0100
Bastien <bzg@gnu.org> wrote:

> The emacs-24 branch is for bug fixes only.
Thanks.

> I don't think there is information about this in the 
> source code, but it was stated clearly on the mailing
> list.
If it is in places like:
etc/CONTRIBUTE
http://savannah.gnu.org/bzr/?group=emacs
www.emacswiki.org/emacs/BzrForEmacsDevs

it will be better.

-- 
Best regards, Xue Fuqiao.
http://www.emacswiki.org/emacs/XueFuqiao