Integration of dictionary package

Integration of dictionary package

[Torsten Hilbrich]

Hello,

by suggestion of Jean Louis I have started integrating the dictionary
package (found on https://github.com/myrkr/dictionary-el/).

The work can be found on the feature/integration-of-dictionary-el branch.

It contains the following commits:

b6227446d9 Importing dictionary module
658ec3ccee Renamed connection.el
e2ebffdd62 Renamed link.el
723906c444 Removed some compability parts in dictionary

I plan to integrate some future changes:

- support for dictionary-search to have the highlighted region as default
- support for initially looking up on localhost and the switching to
dict.org

Thanks for reviewing,

	Torsten

Re: Integration of dictionary package

[Robert Pluim]

>>>>> On Thu, 8 Oct 2020 18:01:11 +0200, Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> said:

    Torsten> Hello,
    Torsten> by suggestion of Jean Louis I have started integrating the dictionary
    Torsten> package (found on https://github.com/myrkr/dictionary-el/).

    Torsten> The work can be found on the feature/integration-of-dictionary-el branch.

    Torsten> It contains the following commits:

    Torsten> b6227446d9 Importing dictionary module
    Torsten> 658ec3ccee Renamed connection.el
    Torsten> e2ebffdd62 Renamed link.el
    Torsten> 723906c444 Removed some compability parts in dictionary

    Torsten> I plan to integrate some future changes:

    Torsten> - support for dictionary-search to have the highlighted region as default
    Torsten> - support for initially looking up on localhost and the switching to
    Torsten> dict.org

    Torsten> Thanks for reviewing,

I took a quick look, the only comment I have is that perhaps the
defcustom's should have :version "28.1" in them, since theyʼre being
introduced in 28.1

Thanks for doing this.

Robert
-- 

Re: Integration of dictionary package

[Philip K.]

Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> writes:

> Hello,
>
> by suggestion of Jean Louis I have started integrating the dictionary
> package (found on https://github.com/myrkr/dictionary-el/).
>
> The work can be found on the feature/integration-of-dictionary-el branch.
>
> It contains the following commits:
>
> b6227446d9 Importing dictionary module
> 658ec3ccee Renamed connection.el
> e2ebffdd62 Renamed link.el

I was reading and rewriting parts of dictionary.el, and was wondering if
connection.el and link.el should be kept if the package were to be
merged into the core. Connection.el seems to just be a wrapper around
the regular networking operations, and link.el should be replaceable by
the button mechanism, shouldn't it?

> 723906c444 Removed some compability parts in dictionary
>
> I plan to integrate some future changes:
>
> - support for dictionary-search to have the highlighted region as
> default

How will this be handled? If I select more than one word, will every
word be queried?

> - support for initially looking up on localhost and the switching to
> dict.org

Will this be enabled by default? And in case there is no local server,
will this slow operations down, or do you plan on caching the connected
server?

> Thanks for reviewing,
>
> 	Torsten

-- 
	Philip K.

Re: Integration of dictionary package

[Eli Zaretskii]

> From: "Philip K." <philipk@posteo.net>
> Date: Thu, 08 Oct 2020 19:33:16 +0200
> Cc: emacs-devel@gnu.org
> 
> > - support for initially looking up on localhost and the switching to
> > dict.org
> 
> Will this be enabled by default? And in case there is no local server,
> will this slow operations down, or do you plan on caching the connected
> server?

I think the existence of a local server should be probed just once,
when the package is activated.

Re: Integration of dictionary package

[Jean Louis]

* Eli Zaretskii <eliz@gnu.org> [2020-10-08 20:38]:
> > From: "Philip K." <philipk@posteo.net>
> > Date: Thu, 08 Oct 2020 19:33:16 +0200
> > Cc: emacs-devel@gnu.org
> > 
> > > - support for initially looking up on localhost and the switching to
> > > dict.org
> > 
> > Will this be enabled by default? And in case there is no local server,
> > will this slow operations down, or do you plan on caching the connected
> > server?
> 
> I think the existence of a local server should be probed just once,
> when the package is activated.

Local server may be started manually and not at system startup
time. dictionary.el should check for local server each time, as it is
easy and quick, it does not delay visibly.

Re: Integration of dictionary package

[Torsten Hilbrich]

On 08.10.20 19:33, Philip K. wrote:
>> I plan to integrate some future changes:
>>
>> - support for dictionary-search to have the highlighted region as
>> default
> 
> How will this be handled? If I select more than one word, will every
> word be queried?

The idea was to query to whole selected region. Otherwise the current
word would be used as default.

	Torsten

Re: Integration of dictionary package - match strategy

[Jean Louis]

* Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-10-08 20:46]:
> On 08.10.20 19:33, Philip K. wrote:
> >> I plan to integrate some future changes:
> >>
> >> - support for dictionary-search to have the highlighted region as
> >> default
> > 
> > How will this be handled? If I select more than one word, will every
> > word be queried?
> 
> The idea was to query to whole selected region. Otherwise the current
> word would be used as default.

In addition, let us not forget various ways of querying, the "match
strategy", one can see it here: https://dicoweb.gnu.org.ua/

Jean

Re: Integration of dictionary package

[Torsten Hilbrich]

On 08.10.20 19:33, Philip K. wrote:
> I was reading and rewriting parts of dictionary.el, and was wondering if
> connection.el and link.el should be kept if the package were to be
> merged into the core. Connection.el seems to just be a wrapper around
> the regular networking operations, and link.el should be replaceable by
> the button mechanism, shouldn't it?

I will have to look into how the buttons work.

The dictionary-connection.el file could also be integrated into
dictionary.el. Especially, if dictionary-link.el has been replaced.

	Torsten

Re: Integration of dictionary package

[Matthias Meulien]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> writes:

> by suggestion of Jean Louis I have started integrating the 
> dictionary package (found on 
> https://github.com/myrkr/dictionary-el/). 

Thanks for working on this.

Here are two minor improvments:
- Remove text property from on empty lines
- Add history to read-string


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Remove-text-property-from-empty-line.patch --]
[-- Type: text/x-diff, Size: 1097 bytes --]

From 7453384d19e5f662f3623ff998656797ed325f3d Mon Sep 17 00:00:00 2001
From: Matthias Meulien <orontee@gmail.com>
Date: Sun, 8 Nov 2020 16:06:02 +0100
Subject: [PATCH 1/2] Remove text property from empty line

---
 lisp/net/dictionary.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 8d7d97afe0..6fa1ea408e 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -762,9 +762,9 @@ dictionary-display-word-entry
 	    dictionary-description-open-delimiter
 	    (dictionary-decode-charset description dictionary)
 	    dictionary-description-close-delimiter
-	    " [" (dictionary-decode-charset dictionary dictionary) "]:"
-	    "\n\n")
-    (put-text-property start (point) 'face 'dictionary-word-entry-face)))
+	    " [" (dictionary-decode-charset dictionary dictionary) "]:")
+    (put-text-property start (point) 'face 'dictionary-word-entry-face)
+    (insert "\n\n")))
 
 (defun dictionary-display-word-definition (reply word dictionary)
   "Insert the definition for the current word"
-- 
2.20.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-Add-history-of-search-words-to-read-string.patch --]
[-- Type: text/x-diff, Size: 2015 bytes --]

From f4375c800669b1422d2a7aabf729ab04d8a362cf Mon Sep 17 00:00:00 2001
From: Matthias Meulien <orontee@gmail.com>
Date: Sun, 8 Nov 2020 16:08:07 +0100
Subject: [PATCH 2/2] Add history of search words to read-string

---
 lisp/net/dictionary.el | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 6fa1ea408e..849b2f35d0 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -333,6 +333,10 @@ dictionary-color-support
     (error nil))
   "Determines if the Emacs has support to display color")
 
+(defvar dictionary-word-history
+  '()
+  "History list of searched word")
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Basic function providing startup actions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1092,7 +1096,7 @@ dictionary-search
            (read-string (if default
                             (format "Search word (%s): " default)
                           "Search word: ")
-                        nil nil default))
+                        nil 'dictionary-word-history default))
 	 (if current-prefix-arg
 	     (read-string (if dictionary-default-dictionary
 			      (format "Dictionary (%s): " dictionary-default-dictionary)
@@ -1102,7 +1106,7 @@ dictionary-search
 
   ;; if called by pressing the button
   (unless word
-    (setq word (read-string "Search word: ")))
+    (setq word (read-string "Search word: " nil 'dictionary-word-history)))
   ;; just in case non-interactivly called
   (unless dictionary
     (setq dictionary dictionary-default-dictionary))
@@ -1132,7 +1136,8 @@ dictionary-match-words
   (interactive)
   ;; can't use interactive because of mouse events
   (or pattern
-      (setq pattern (read-string "Search pattern: ")))
+      (setq pattern (read-string "Search pattern: "
+                                 nil 'dictionary-word-history)))
   (dictionary-new-matching pattern))
 
 ;;;###autoload
-- 
2.20.1


[-- Attachment #4: Type: text/plain, Size: 14 bytes --]


-- 
Matthias

Re: Integration of dictionary package

[Torsten Hilbrich]

On 08.11.20 16:16, Matthias Meulien wrote:
> Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> writes:
> 
>> by suggestion of Jean Louis I have started integrating the dictionary
>> package (found on https://github.com/myrkr/dictionary-el/). 
> 
> Thanks for working on this.
> 
> Here are two minor improvments:
> - Remove text property from on empty lines
> - Add history to read-string

Thanks for the suggestion, I will add them to my branch.

I have now completed the work on my branch
feature/integration-of-dictionary-el. For reference, here is a list of
the commits so far:

b6227446d9 Importing dictionary module
658ec3ccee Renamed connection.el
e2ebffdd62 Renamed link.el
723906c444 Removed some compability parts in dictionary
5dc17d73b0 Add :version tag to defcustom statement
49c250b388 Dont't check coding-system-list for existence
99a7e918c8 Don't check for existence of defface
1773b9b687 Dictionary now uses button
329b6a0210 Adding details page for dictionary
837505075c Fix dictionary tooltip mode
2f1e4fbc42 Support nil value for dictionary-server
91ff1c8f7c Move placement of dictionary-tooltip-mouse-event
28fe134971 Remove text property from empty line
7ca331a4f9 Add history of search words to read-string

I have also implemented the suggestion that dictionary-server should
have a default value where first a search on localhost is considered. If
that fails and the user agrees to it the search will be done at
dict.org. The customization of that variable allows the user to select
either this automatic mode (default), search on localhost only, search
on dict.org or search on a user-supplied server.

I think the code is now ready for merging.

How is this done and where to merge the code into? Shall I do the merge
by myself or it is done by some specific maintainer who are handling this?

Thanks,

	Torsten

Re: Integration of dictionary package

[Jean Louis]

* Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-19 10:41]:
> On 08.11.20 16:16, Matthias Meulien wrote:
> > Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> writes:
> > 
> >> by suggestion of Jean Louis I have started integrating the dictionary
> >> package (found on https://github.com/myrkr/dictionary-el/). 
> > 
> > Thanks for working on this.
> > 
> > Here are two minor improvments:
> > - Remove text property from on empty lines
> > - Add history to read-string
> 
> Thanks for the suggestion, I will add them to my branch.
> 
> I have now completed the work on my branch
> feature/integration-of-dictionary-el. For reference, here is a list of
> the commits so far:

That is so great Torsten.

Re: Integration of dictionary package

[Eli Zaretskii]

> From: Torsten Hilbrich <emacs.nolkaf@hilbrich.tk>
> Date: Thu, 19 Nov 2020 08:40:21 +0100
> Cc: orontee@gmail.com
> 
> I think the code is now ready for merging.

Thanks for your work and efforts.

> How is this done and where to merge the code into? Shall I do the merge
> by myself or it is done by some specific maintainer who are handling this?

You merge in your clone and then push.

But please wait for a few days so that people (including myself) could
review the branch, in case something is still left to be done.

Re: Integration of dictionary package

[Stefan Kangas]

Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> writes:

> I have now completed the work on my branch
> feature/integration-of-dictionary-el. For reference, here is a list of
> the commits so far:

Do you have any unit tests for this stuff?  If you do, it would be nice
if we could bring that over too.

I don't use this stuff myself (yet?), so I unfortunately can't provide
substantial feedback.  But please find some minor comments and nits
mostly regarding our coding conventions below.

> +;;; dictionary-connection.el --- TCP-based client connection for dictionary

Any chance we could use lexical-binding:t here?

> +;; the Free Software Foundation; either version 2, or (at your option)

Should be version 3.

> +;; any later version.
> +
> +(defmacro dictionary-connection-p (connection)

Would it make sense to change this and the ones below it into defuns?

> +(defun dictionary-connection-create-data (buffer process point)
> +  "Create a new connection data based on `buffer', `process', and `point'."

Our convention is to format docstrings like:

    "Create a new connection data based on BUFFER, PROCESS and POINT."

> +(defun dictionary-connection-status (connection)
> +  "Return the status of the connection.
> +Possible return values are the symbols:
> +nil: argument is no connection object
> +'none: argument has no connection
> +'up: connection is open and buffer is existing
> +'down: connection is closed
> +'alone: connection is not associated with a buffer"
> +  (if (dictionary-connection-p connection)

Very minor nit: If you change this to a `when', you don't need the nil
at the end.

> +;;; dictionary.el --- Client for rfc2229 dictionary servers

Same as above: Any chance we could use lexical-binding:t here?

> +  (make-local-variable 'dictionary-data-stack)
> +  (setq dictionary-data-stack nil)

You could use `setq-local' here instead.

> +	    (error "Dictionary \"%s\" not existing" dictionary)

How about "does not exist"?

Re: Integration of dictionary package

[Jean Louis]

* Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-19 10:41]:
> I have now completed the work on my branch
> feature/integration-of-dictionary-el. For reference, here is a list of

Please help me get the branch. I see only this:

$ git branch --list --all
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

Re: Integration of dictionary package

[Eli Zaretskii]

> Date: Thu, 19 Nov 2020 20:35:40 +0300
> From: Jean Louis <bugs@gnu.support>
> Cc: orontee@gmail.com, emacs-devel@gnu.org
> 
> * Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-19 10:41]:
> > I have now completed the work on my branch
> > feature/integration-of-dictionary-el. For reference, here is a list of
> 
> Please help me get the branch. I see only this:
> 
> $ git branch --list --all
> * master
>   remotes/origin/HEAD -> origin/master
>   remotes/origin/master

maybe you cloned the Emacs repository in some non-default way, or have
some customizations of "git branch" in your ~/.gitconfig?  Because by
default the above command shows all the branches in the repository,
including

  remotes/origin/feature/integration-of-dictionary-el

Re: Integration of dictionary package

[Jean Louis]

* Eli Zaretskii <eliz@gnu.org> [2020-11-19 20:54]:
> > Date: Thu, 19 Nov 2020 20:35:40 +0300
> > From: Jean Louis <bugs@gnu.support>
> > Cc: orontee@gmail.com, emacs-devel@gnu.org
> > 
> > * Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-19 10:41]:
> > > I have now completed the work on my branch
> > > feature/integration-of-dictionary-el. For reference, here is a list of
> > 
> > Please help me get the branch. I see only this:
> > 
> > $ git branch --list --all
> > * master
> >   remotes/origin/HEAD -> origin/master
> >   remotes/origin/master
> 
> maybe you cloned the Emacs repository in some non-default way, or have
> some customizations of "git branch" in your ~/.gitconfig?  Because by
> default the above command shows all the branches in the repository,
> including
> 
>   remotes/origin/feature/integration-of-dictionary-el

OK I got it now. And I checked it out.

$ git branch --list
* feature/integration-of-dictionary-el
  master

Only that I do not find any file *dict* in the tree. I did the fetch.

Re: Integration of dictionary package

[Eli Zaretskii]

> Date: Thu, 19 Nov 2020 22:18:40 +0300
> From: Jean Louis <bugs@gnu.support>
> Cc: emacs.nolkaf@hilbrich.tk, orontee@gmail.com, emacs-devel@gnu.org
> 
> $ git branch --list
> * feature/integration-of-dictionary-el
>   master
> 
> Only that I do not find any file *dict* in the tree. I did the fetch.

Why should there be?  This branch only brings us the dictionary.el
file that is the interface to dict servers.

Re: Integration of dictionary package

[Torsten Hilbrich]

On 19.11.20 18:35, Jean Louis wrote:
> * Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-19 10:41]:
>> I have now completed the work on my branch
>> feature/integration-of-dictionary-el. For reference, here is a list of
> 
> Please help me get the branch. I see only this:
> 
> $ git branch --list --all
> * master
>   remotes/origin/HEAD -> origin/master
>   remotes/origin/master

I assume you are looking at the wrong repository. The above branch is
found in the Emacs repository at git.savannah.gnu.org:/srv/git/emacs.git

	Torsten

Re: Integration of dictionary package

[Jean Louis]

* Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-19 22:09]:
> On 19.11.20 18:35, Jean Louis wrote:
> > * Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-19 10:41]:
> >> I have now completed the work on my branch
> >> feature/integration-of-dictionary-el. For reference, here is a list of
> > 
> > Please help me get the branch. I see only this:
> > 
> > $ git branch --list --all
> > * master
> >   remotes/origin/HEAD -> origin/master
> >   remotes/origin/master
> 
> I assume you are looking at the wrong repository. The above branch is
> found in the Emacs repository at
> git.savannah.gnu.org:/srv/git/emacs.git

What would be best to do after this to get dictionary.el working
for testing without observing these problems?

There is other file dictionary.el under cedet, I hope that will not
cause problem.

~/Programming/Software/emacs $ git pull origin feature/integration-of-dictionary-el
From git://git.sv.gnu.org/emacs
 * branch                  feature/integration-of-dictionary-el -> FETCH_HEAD
Auto-merging test/src/xdisp-tests.el
CONFLICT (add/add): Merge conflict in test/src/xdisp-tests.el
Auto-merging test/src/syntax-tests.el
CONFLICT (content): Merge conflict in test/src/syntax-tests.el
Auto-merging test/src/print-tests.el
CONFLICT (content): Merge conflict in test/src/print-tests.el
Auto-merging test/src/emacs-module-tests.el
CONFLICT (content): Merge conflict in test/src/emacs-module-tests.el
Auto-merging test/src/emacs-module-resources/mod-test.c
CONFLICT (content): Merge conflict in test/src/emacs-module-resources/mod-test.c
CONFLICT (modify/delete): test/src/doc-tests.el deleted in HEAD and modified in 7ca331a4f94a6a5f9c454823fd5c765031ce7167. Version 7ca331a4f94a6a5f9c454823fd5c765031ce7167 of test/src/doc-tests.el left in tree.
Auto-merging test/lisp/wid-edit-tests.el
CONFLICT (content): Merge conflict in test/lisp/wid-edit-tests.el
Auto-merging test/lisp/vc/diff-mode-tests.el
CONFLICT (content): Merge conflict in test/lisp/vc/diff-mode-tests.el
Auto-merging test/lisp/textmodes/css-mode-tests.el
CONFLICT (content): Merge conflict in test/lisp/textmodes/css-mode-tests.el
Auto-merging test/lisp/textmodes/bibtex-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/textmodes/bibtex-tests.el
Auto-merging test/lisp/saveplace-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/saveplace-tests.el
Auto-merging test/lisp/progmodes/ruby-mode-tests.el
CONFLICT (content): Merge conflict in test/lisp/progmodes/ruby-mode-tests.el
Auto-merging test/lisp/progmodes/cperl-mode-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/progmodes/cperl-mode-tests.el
Auto-merging test/lisp/progmodes/cperl-mode-resources/cperl-indent-styles.pl
CONFLICT (add/add): Merge conflict in test/lisp/progmodes/cperl-mode-resources/cperl-indent-styles.pl
Auto-merging test/lisp/progmodes/compile-tests.el
CONFLICT (content): Merge conflict in test/lisp/progmodes/compile-tests.el
Auto-merging test/lisp/pcmpl-linux-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/pcmpl-linux-tests.el
Auto-merging test/lisp/net/tramp-tests.el
CONFLICT (content): Merge conflict in test/lisp/net/tramp-tests.el
Auto-merging test/lisp/net/dbus-tests.el
CONFLICT (content): Merge conflict in test/lisp/net/dbus-tests.el
Auto-merging test/lisp/help-fns-tests.el
CONFLICT (content): Merge conflict in test/lisp/help-fns-tests.el
Auto-merging test/lisp/gnus/mml-sec-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/gnus/mml-sec-tests.el
Auto-merging test/lisp/gnus/gnus-util-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/gnus/gnus-util-tests.el
Auto-merging test/lisp/ffap-tests.el
CONFLICT (content): Merge conflict in test/lisp/ffap-tests.el
Auto-merging test/lisp/emacs-lisp/unsafep-tests.el
CONFLICT (content): Merge conflict in test/lisp/emacs-lisp/unsafep-tests.el
Auto-merging test/lisp/emacs-lisp/rx-tests.el
CONFLICT (content): Merge conflict in test/lisp/emacs-lisp/rx-tests.el
Auto-merging test/lisp/emacs-lisp/find-func-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/emacs-lisp/find-func-tests.el
Auto-merging test/lisp/emacs-lisp/bindat-tests.el
Auto-merging test/lisp/custom-tests.el
CONFLICT (content): Merge conflict in test/lisp/custom-tests.el
Auto-merging test/lisp/calendar/time-date-tests.el
CONFLICT (content): Merge conflict in test/lisp/calendar/time-date-tests.el
Auto-merging test/lisp/calendar/icalendar-tests.el
CONFLICT (content): Merge conflict in test/lisp/calendar/icalendar-tests.el
Auto-merging test/lisp/calc/calc-tests.el
CONFLICT (content): Merge conflict in test/lisp/calc/calc-tests.el
Auto-merging test/lisp/bookmark-tests.el
CONFLICT (content): Merge conflict in test/lisp/bookmark-tests.el
Auto-merging test/lisp/autorevert-tests.el
CONFLICT (content): Merge conflict in test/lisp/autorevert-tests.el
Auto-merging src/xwidget.c
CONFLICT (content): Merge conflict in src/xwidget.c
Auto-merging src/xdisp.c
CONFLICT (content): Merge conflict in src/xdisp.c
Auto-merging src/nsxwidget.m
CONFLICT (add/add): Merge conflict in src/nsxwidget.m
Auto-merging src/nsxwidget.h
CONFLICT (add/add): Merge conflict in src/nsxwidget.h
Auto-merging src/nsterm.m
CONFLICT (content): Merge conflict in src/nsterm.m
Auto-merging src/nsfont.m
CONFLICT (content): Merge conflict in src/nsfont.m
Auto-merging src/module-env-28.h
CONFLICT (add/add): Merge conflict in src/module-env-28.h
Auto-merging src/keymap.c
CONFLICT (content): Merge conflict in src/keymap.c
Auto-merging src/image.c
CONFLICT (content): Merge conflict in src/image.c
Auto-merging src/font.c
CONFLICT (content): Merge conflict in src/font.c
Auto-merging src/emacs-module.c
CONFLICT (content): Merge conflict in src/emacs-module.c
Auto-merging src/dbusbind.c
CONFLICT (content): Merge conflict in src/dbusbind.c
Auto-merging src/character.h
CONFLICT (content): Merge conflict in src/character.h
Auto-merging src/alloc.c
CONFLICT (content): Merge conflict in src/alloc.c
Auto-merging lisp/wdired.el
CONFLICT (content): Merge conflict in lisp/wdired.el
Auto-merging lisp/vc/vc.el
CONFLICT (content): Merge conflict in lisp/vc/vc.el
Auto-merging lisp/tmm.el
CONFLICT (content): Merge conflict in lisp/tmm.el
Auto-merging lisp/time.el
CONFLICT (content): Merge conflict in lisp/time.el
Auto-merging lisp/textmodes/table.el
CONFLICT (content): Merge conflict in lisp/textmodes/table.el
Auto-merging lisp/textmodes/flyspell.el
CONFLICT (content): Merge conflict in lisp/textmodes/flyspell.el
Auto-merging lisp/textmodes/css-mode.el
CONFLICT (content): Merge conflict in lisp/textmodes/css-mode.el
Auto-merging lisp/subr.el
CONFLICT (content): Merge conflict in lisp/subr.el
Auto-merging lisp/skeleton.el
CONFLICT (content): Merge conflict in lisp/skeleton.el
Auto-merging lisp/simple.el
CONFLICT (content): Merge conflict in lisp/simple.el
Auto-merging lisp/savehist.el
CONFLICT (content): Merge conflict in lisp/savehist.el
Auto-merging lisp/progmodes/xref.el
CONFLICT (content): Merge conflict in lisp/progmodes/xref.el
Auto-merging lisp/progmodes/python.el
CONFLICT (content): Merge conflict in lisp/progmodes/python.el
Auto-merging lisp/progmodes/project.el
CONFLICT (content): Merge conflict in lisp/progmodes/project.el
Auto-merging lisp/progmodes/grep.el
CONFLICT (content): Merge conflict in lisp/progmodes/grep.el
Auto-merging lisp/progmodes/gdb-mi.el
CONFLICT (content): Merge conflict in lisp/progmodes/gdb-mi.el
Auto-merging lisp/progmodes/elisp-mode.el
CONFLICT (content): Merge conflict in lisp/progmodes/elisp-mode.el
Auto-merging lisp/progmodes/cperl-mode.el
CONFLICT (content): Merge conflict in lisp/progmodes/cperl-mode.el
Auto-merging lisp/progmodes/compile.el
CONFLICT (content): Merge conflict in lisp/progmodes/compile.el
Auto-merging lisp/progmodes/cl-font-lock.el
CONFLICT (add/add): Merge conflict in lisp/progmodes/cl-font-lock.el
Auto-merging lisp/progmodes/cc-mode.el
CONFLICT (content): Merge conflict in lisp/progmodes/cc-mode.el
Auto-merging lisp/progmodes/cc-langs.el
CONFLICT (content): Merge conflict in lisp/progmodes/cc-langs.el
Auto-merging lisp/progmodes/cc-defs.el
CONFLICT (content): Merge conflict in lisp/progmodes/cc-defs.el
Auto-merging lisp/play/bubbles.el
CONFLICT (content): Merge conflict in lisp/play/bubbles.el
Auto-merging lisp/outline.el
CONFLICT (content): Merge conflict in lisp/outline.el
Auto-merging lisp/net/tramp.el
CONFLICT (content): Merge conflict in lisp/net/tramp.el
Auto-merging lisp/net/tramp-smb.el
CONFLICT (content): Merge conflict in lisp/net/tramp-smb.el
Auto-merging lisp/net/tramp-sh.el
CONFLICT (content): Merge conflict in lisp/net/tramp-sh.el
Auto-merging lisp/net/tramp-gvfs.el
CONFLICT (content): Merge conflict in lisp/net/tramp-gvfs.el
Auto-merging lisp/net/tramp-crypt.el
CONFLICT (add/add): Merge conflict in lisp/net/tramp-crypt.el
Auto-merging lisp/net/tramp-compat.el
CONFLICT (content): Merge conflict in lisp/net/tramp-compat.el
Auto-merging lisp/net/ntlm.el
CONFLICT (content): Merge conflict in lisp/net/ntlm.el
Auto-merging lisp/net/mailcap.el
CONFLICT (content): Merge conflict in lisp/net/mailcap.el
Auto-merging lisp/net/eww.el
Auto-merging lisp/net/dbus.el
CONFLICT (content): Merge conflict in lisp/net/dbus.el
Auto-merging lisp/net/browse-url.el
Auto-merging lisp/net/ange-ftp.el
CONFLICT (content): Merge conflict in lisp/net/ange-ftp.el
Auto-merging lisp/mwheel.el
CONFLICT (content): Merge conflict in lisp/mwheel.el
Auto-merging lisp/mail/mail-extr.el
CONFLICT (content): Merge conflict in lisp/mail/mail-extr.el
Auto-merging lisp/mail/emacsbug.el
CONFLICT (content): Merge conflict in lisp/mail/emacsbug.el
Auto-merging lisp/ldefs-boot.el
CONFLICT (content): Merge conflict in lisp/ldefs-boot.el
Auto-merging lisp/language/misc-lang.el
CONFLICT (content): Merge conflict in lisp/language/misc-lang.el
Auto-merging lisp/isearch.el
CONFLICT (content): Merge conflict in lisp/isearch.el
Auto-merging lisp/international/mule.el
CONFLICT (content): Merge conflict in lisp/international/mule.el
Auto-merging lisp/ielm.el
CONFLICT (content): Merge conflict in lisp/ielm.el
Auto-merging lisp/gnus/nnselect.el
CONFLICT (add/add): Merge conflict in lisp/gnus/nnselect.el
Auto-merging lisp/gnus/message.el
CONFLICT (content): Merge conflict in lisp/gnus/message.el
Auto-merging lisp/gnus/gnus-util.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-util.el
Auto-merging lisp/gnus/gnus-group.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-group.el
Auto-merging lisp/gnus/gnus-fun.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-fun.el
Auto-merging lisp/gnus/gnus-async.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-async.el
Auto-merging lisp/gnus/gnus-art.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-art.el
Auto-merging lisp/gnus/gnus-agent.el
Auto-merging lisp/ffap.el
CONFLICT (content): Merge conflict in lisp/ffap.el
Auto-merging lisp/eshell/em-pred.el
Auto-merging lisp/eshell/em-hist.el
CONFLICT (content): Merge conflict in lisp/eshell/em-hist.el
Auto-merging lisp/erc/erc-log.el
CONFLICT (content): Merge conflict in lisp/erc/erc-log.el
Auto-merging lisp/emacs-lisp/warnings.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/warnings.el
Auto-merging lisp/emacs-lisp/timer-list.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/timer-list.el
Auto-merging lisp/emacs-lisp/package.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/package.el
Auto-merging lisp/emacs-lisp/lisp.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/lisp.el
Auto-merging lisp/emacs-lisp/eldoc.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/eldoc.el
Auto-merging lisp/emacs-lisp/edebug.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/edebug.el
Auto-merging lisp/emacs-lisp/easy-mmode.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/easy-mmode.el
Auto-merging lisp/emacs-lisp/byte-opt.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/byte-opt.el
Auto-merging lisp/doc-view.el
CONFLICT (content): Merge conflict in lisp/doc-view.el
Auto-merging lisp/display-fill-column-indicator.el
CONFLICT (content): Merge conflict in lisp/display-fill-column-indicator.el
Auto-merging lisp/disp-table.el
CONFLICT (content): Merge conflict in lisp/disp-table.el
Auto-merging lisp/custom.el
CONFLICT (content): Merge conflict in lisp/custom.el
Auto-merging lisp/cus-edit.el
CONFLICT (content): Merge conflict in lisp/cus-edit.el
Auto-merging lisp/calc/calcalg3.el
CONFLICT (content): Merge conflict in lisp/calc/calcalg3.el
Auto-merging lisp/bookmark.el
CONFLICT (content): Merge conflict in lisp/bookmark.el
Auto-merging lisp/arc-mode.el
CONFLICT (content): Merge conflict in lisp/arc-mode.el
Auto-merging etc/themes/modus-vivendi-theme.el
CONFLICT (add/add): Merge conflict in etc/themes/modus-vivendi-theme.el
Auto-merging etc/themes/modus-operandi-theme.el
CONFLICT (add/add): Merge conflict in etc/themes/modus-operandi-theme.el
Auto-merging etc/PROBLEMS
CONFLICT (content): Merge conflict in etc/PROBLEMS
Auto-merging etc/NEWS.27
CONFLICT (add/add): Merge conflict in etc/NEWS.27
Auto-merging etc/NEWS
CONFLICT (content): Merge conflict in etc/NEWS
Auto-merging doc/misc/tramp.texi
CONFLICT (content): Merge conflict in doc/misc/tramp.texi
Auto-merging doc/misc/gnus.texi
CONFLICT (content): Merge conflict in doc/misc/gnus.texi
Auto-merging doc/lispref/internals.texi
CONFLICT (content): Merge conflict in doc/lispref/internals.texi
Auto-merging doc/emacs/package.texi
CONFLICT (content): Merge conflict in doc/emacs/package.texi
Auto-merging doc/emacs/frames.texi
CONFLICT (content): Merge conflict in doc/emacs/frames.texi
Auto-merging configure.ac
CONFLICT (content): Merge conflict in configure.ac
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.

Re: Integration of dictionary package

[Stefan Kangas]

Jean Louis <bugs@gnu.support> writes:

> There is other file dictionary.el under cedet, I hope that will not
> cause problem.

Should be fine:

(require 'srecode/dictionary)  => srecode/dictionary
(require 'dictionary)          => <error>

Re: Integration of dictionary package

[Eli Zaretskii]

> Date: Thu, 19 Nov 2020 22:27:19 +0300
> From: Jean Louis <bugs@gnu.support>
> Cc: orontee@gmail.com, emacs-devel@gnu.org
> 
> ~/Programming/Software/emacs $ git pull origin feature/integration-of-dictionary-el
> >From git://git.sv.gnu.org/emacs
>  * branch                  feature/integration-of-dictionary-el -> FETCH_HEAD
> Auto-merging test/src/xdisp-tests.el

This is wrong: you do NOT want to pull from that branch into your
master branch!  You need to switch to the
feature/integration-of-dictionary-el branch first.

Re: Integration of dictionary package

[Jean Louis]

* Eli Zaretskii <eliz@gnu.org> [2020-11-19 23:31]:
> > Date: Thu, 19 Nov 2020 22:27:19 +0300
> > From: Jean Louis <bugs@gnu.support>
> > Cc: orontee@gmail.com, emacs-devel@gnu.org
> > 
> > ~/Programming/Software/emacs $ git pull origin feature/integration-of-dictionary-el
> > >From git://git.sv.gnu.org/emacs
> >  * branch                  feature/integration-of-dictionary-el -> FETCH_HEAD
> > Auto-merging test/src/xdisp-tests.el
> 
> This is wrong: you do NOT want to pull from that branch into your
> master branch!  You need to switch to the
> feature/integration-of-dictionary-el branch first.

I did:

git reset -hard master

git checkout -b feature/integration-of-dictionary-el

git pull origin feature/integration-of-dictionary-el

So that is where I got stuck.

From git://git.sv.gnu.org/emacs
 * branch                  feature/integration-of-dictionary-el -> FETCH_HEAD
Performing inexact rename detection: 100% (29652/29652), done.
Auto-merging test/src/xdisp-tests.el
CONFLICT (add/add): Merge conflict in test/src/xdisp-tests.el
Auto-merging test/src/syntax-tests.el
CONFLICT (content): Merge conflict in test/src/syntax-tests.el
Auto-merging test/src/print-tests.el
CONFLICT (content): Merge conflict in test/src/print-tests.el
Auto-merging test/src/fns-tests.el
CONFLICT (content): Merge conflict in test/src/fns-tests.el
Auto-merging test/src/emacs-module-tests.el
CONFLICT (content): Merge conflict in test/src/emacs-module-tests.el
Auto-merging test/src/emacs-module-resources/mod-test.c
CONFLICT (content): Merge conflict in test/src/emacs-module-resources/mod-test.c
CONFLICT (modify/delete): test/src/doc-tests.el deleted in HEAD and modified in 7ca331a4f94a6a5f9c454823fd5c765031ce7167. Version 7ca331a4f94a6a5f9c454823fd5c765031ce7167 of test/src/doc-tests.el left in tree.
Auto-merging test/lisp/wid-edit-tests.el
CONFLICT (content): Merge conflict in test/lisp/wid-edit-tests.el
Auto-merging test/lisp/vc/diff-mode-tests.el
CONFLICT (content): Merge conflict in test/lisp/vc/diff-mode-tests.el
Auto-merging test/lisp/textmodes/css-mode-tests.el
CONFLICT (content): Merge conflict in test/lisp/textmodes/css-mode-tests.el
Auto-merging test/lisp/textmodes/bibtex-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/textmodes/bibtex-tests.el
Auto-merging test/lisp/saveplace-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/saveplace-tests.el
Auto-merging test/lisp/progmodes/ruby-mode-tests.el
CONFLICT (content): Merge conflict in test/lisp/progmodes/ruby-mode-tests.el
Auto-merging test/lisp/progmodes/cperl-mode-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/progmodes/cperl-mode-tests.el
Auto-merging test/lisp/progmodes/cperl-mode-resources/cperl-indent-styles.pl
CONFLICT (add/add): Merge conflict in test/lisp/progmodes/cperl-mode-resources/cperl-indent-styles.pl
Auto-merging test/lisp/progmodes/compile-tests.el
CONFLICT (content): Merge conflict in test/lisp/progmodes/compile-tests.el
Auto-merging test/lisp/pcmpl-linux-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/pcmpl-linux-tests.el
Auto-merging test/lisp/net/tramp-tests.el
CONFLICT (content): Merge conflict in test/lisp/net/tramp-tests.el
Auto-merging test/lisp/net/dbus-tests.el
CONFLICT (content): Merge conflict in test/lisp/net/dbus-tests.el
Auto-merging test/lisp/help-fns-tests.el
CONFLICT (content): Merge conflict in test/lisp/help-fns-tests.el
Auto-merging test/lisp/gnus/mml-sec-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/gnus/mml-sec-tests.el
Auto-merging test/lisp/gnus/gnus-util-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/gnus/gnus-util-tests.el
Auto-merging test/lisp/ffap-tests.el
CONFLICT (content): Merge conflict in test/lisp/ffap-tests.el
Auto-merging test/lisp/emacs-lisp/unsafep-tests.el
CONFLICT (content): Merge conflict in test/lisp/emacs-lisp/unsafep-tests.el
Auto-merging test/lisp/emacs-lisp/rx-tests.el
CONFLICT (content): Merge conflict in test/lisp/emacs-lisp/rx-tests.el
Auto-merging test/lisp/emacs-lisp/find-func-tests.el
CONFLICT (add/add): Merge conflict in test/lisp/emacs-lisp/find-func-tests.el
Auto-merging test/lisp/emacs-lisp/bindat-tests.el
Auto-merging test/lisp/custom-tests.el
CONFLICT (content): Merge conflict in test/lisp/custom-tests.el
Auto-merging test/lisp/calendar/time-date-tests.el
CONFLICT (content): Merge conflict in test/lisp/calendar/time-date-tests.el
Auto-merging test/lisp/calendar/icalendar-tests.el
CONFLICT (content): Merge conflict in test/lisp/calendar/icalendar-tests.el
Auto-merging test/lisp/calc/calc-tests.el
CONFLICT (content): Merge conflict in test/lisp/calc/calc-tests.el
Auto-merging test/lisp/bookmark-tests.el
CONFLICT (content): Merge conflict in test/lisp/bookmark-tests.el
Auto-merging test/lisp/autorevert-tests.el
CONFLICT (content): Merge conflict in test/lisp/autorevert-tests.el
Auto-merging src/xwidget.c
CONFLICT (content): Merge conflict in src/xwidget.c
Auto-merging src/xdisp.c
CONFLICT (content): Merge conflict in src/xdisp.c
Auto-merging src/nsxwidget.m
CONFLICT (add/add): Merge conflict in src/nsxwidget.m
Auto-merging src/nsxwidget.h
CONFLICT (add/add): Merge conflict in src/nsxwidget.h
Auto-merging src/nsterm.m
CONFLICT (content): Merge conflict in src/nsterm.m
Auto-merging src/nsfont.m
CONFLICT (content): Merge conflict in src/nsfont.m
Auto-merging src/module-env-28.h
CONFLICT (add/add): Merge conflict in src/module-env-28.h
Auto-merging src/keymap.c
CONFLICT (content): Merge conflict in src/keymap.c
Auto-merging src/image.c
CONFLICT (content): Merge conflict in src/image.c
Auto-merging src/font.c
CONFLICT (content): Merge conflict in src/font.c
Auto-merging src/fns.c
CONFLICT (content): Merge conflict in src/fns.c
Auto-merging src/emacs-module.c
CONFLICT (content): Merge conflict in src/emacs-module.c
Auto-merging src/dbusbind.c
CONFLICT (content): Merge conflict in src/dbusbind.c
Auto-merging src/character.h
CONFLICT (content): Merge conflict in src/character.h
Auto-merging src/alloc.c
CONFLICT (content): Merge conflict in src/alloc.c
Auto-merging lisp/wdired.el
CONFLICT (content): Merge conflict in lisp/wdired.el
Auto-merging lisp/vc/vc.el
CONFLICT (content): Merge conflict in lisp/vc/vc.el
Auto-merging lisp/vc/diff-mode.el
CONFLICT (content): Merge conflict in lisp/vc/diff-mode.el
Auto-merging lisp/tmm.el
CONFLICT (content): Merge conflict in lisp/tmm.el
Auto-merging lisp/time.el
CONFLICT (content): Merge conflict in lisp/time.el
Auto-merging lisp/textmodes/table.el
CONFLICT (content): Merge conflict in lisp/textmodes/table.el
Auto-merging lisp/textmodes/flyspell.el
CONFLICT (content): Merge conflict in lisp/textmodes/flyspell.el
Auto-merging lisp/textmodes/css-mode.el
CONFLICT (content): Merge conflict in lisp/textmodes/css-mode.el
Auto-merging lisp/subr.el
CONFLICT (content): Merge conflict in lisp/subr.el
Auto-merging lisp/skeleton.el
CONFLICT (content): Merge conflict in lisp/skeleton.el
Auto-merging lisp/simple.el
CONFLICT (content): Merge conflict in lisp/simple.el
Auto-merging lisp/savehist.el
CONFLICT (content): Merge conflict in lisp/savehist.el
Auto-merging lisp/progmodes/xref.el
CONFLICT (content): Merge conflict in lisp/progmodes/xref.el
Auto-merging lisp/progmodes/python.el
CONFLICT (content): Merge conflict in lisp/progmodes/python.el
Auto-merging lisp/progmodes/project.el
CONFLICT (content): Merge conflict in lisp/progmodes/project.el
Auto-merging lisp/progmodes/grep.el
CONFLICT (content): Merge conflict in lisp/progmodes/grep.el
Auto-merging lisp/progmodes/gdb-mi.el
CONFLICT (content): Merge conflict in lisp/progmodes/gdb-mi.el
Auto-merging lisp/progmodes/elisp-mode.el
CONFLICT (content): Merge conflict in lisp/progmodes/elisp-mode.el
Auto-merging lisp/progmodes/cperl-mode.el
CONFLICT (content): Merge conflict in lisp/progmodes/cperl-mode.el
Auto-merging lisp/progmodes/compile.el
CONFLICT (content): Merge conflict in lisp/progmodes/compile.el
Auto-merging lisp/progmodes/cl-font-lock.el
CONFLICT (add/add): Merge conflict in lisp/progmodes/cl-font-lock.el
Auto-merging lisp/progmodes/cc-mode.el
CONFLICT (content): Merge conflict in lisp/progmodes/cc-mode.el
Auto-merging lisp/progmodes/cc-langs.el
CONFLICT (content): Merge conflict in lisp/progmodes/cc-langs.el
Auto-merging lisp/progmodes/cc-defs.el
CONFLICT (content): Merge conflict in lisp/progmodes/cc-defs.el
Auto-merging lisp/play/bubbles.el
CONFLICT (content): Merge conflict in lisp/play/bubbles.el
Auto-merging lisp/outline.el
CONFLICT (content): Merge conflict in lisp/outline.el
Auto-merging lisp/net/tramp.el
CONFLICT (content): Merge conflict in lisp/net/tramp.el
Auto-merging lisp/net/tramp-smb.el
CONFLICT (content): Merge conflict in lisp/net/tramp-smb.el
Auto-merging lisp/net/tramp-sh.el
CONFLICT (content): Merge conflict in lisp/net/tramp-sh.el
Auto-merging lisp/net/tramp-gvfs.el
CONFLICT (content): Merge conflict in lisp/net/tramp-gvfs.el
Auto-merging lisp/net/tramp-crypt.el
CONFLICT (add/add): Merge conflict in lisp/net/tramp-crypt.el
Auto-merging lisp/net/tramp-compat.el
CONFLICT (content): Merge conflict in lisp/net/tramp-compat.el
Auto-merging lisp/net/ntlm.el
CONFLICT (content): Merge conflict in lisp/net/ntlm.el
Auto-merging lisp/net/mailcap.el
CONFLICT (content): Merge conflict in lisp/net/mailcap.el
Auto-merging lisp/net/eww.el
Auto-merging lisp/net/dbus.el
CONFLICT (content): Merge conflict in lisp/net/dbus.el
Auto-merging lisp/net/browse-url.el
Auto-merging lisp/net/ange-ftp.el
CONFLICT (content): Merge conflict in lisp/net/ange-ftp.el
Auto-merging lisp/mwheel.el
CONFLICT (content): Merge conflict in lisp/mwheel.el
Auto-merging lisp/mail/mail-extr.el
CONFLICT (content): Merge conflict in lisp/mail/mail-extr.el
Auto-merging lisp/mail/emacsbug.el
CONFLICT (content): Merge conflict in lisp/mail/emacsbug.el
Auto-merging lisp/ldefs-boot.el
CONFLICT (content): Merge conflict in lisp/ldefs-boot.el
Auto-merging lisp/language/misc-lang.el
CONFLICT (content): Merge conflict in lisp/language/misc-lang.el
Auto-merging lisp/isearch.el
CONFLICT (content): Merge conflict in lisp/isearch.el
Auto-merging lisp/international/mule.el
CONFLICT (content): Merge conflict in lisp/international/mule.el
Auto-merging lisp/ielm.el
CONFLICT (content): Merge conflict in lisp/ielm.el
Auto-merging lisp/gnus/nnselect.el
CONFLICT (add/add): Merge conflict in lisp/gnus/nnselect.el
Auto-merging lisp/gnus/message.el
CONFLICT (content): Merge conflict in lisp/gnus/message.el
Auto-merging lisp/gnus/gnus-util.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-util.el
Auto-merging lisp/gnus/gnus-group.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-group.el
Auto-merging lisp/gnus/gnus-fun.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-fun.el
Auto-merging lisp/gnus/gnus-async.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-async.el
Auto-merging lisp/gnus/gnus-art.el
CONFLICT (content): Merge conflict in lisp/gnus/gnus-art.el
Auto-merging lisp/gnus/gnus-agent.el
Auto-merging lisp/ffap.el
CONFLICT (content): Merge conflict in lisp/ffap.el
Auto-merging lisp/eshell/em-pred.el
Auto-merging lisp/eshell/em-hist.el
CONFLICT (content): Merge conflict in lisp/eshell/em-hist.el
Auto-merging lisp/erc/erc.el
CONFLICT (content): Merge conflict in lisp/erc/erc.el
Auto-merging lisp/erc/erc-log.el
CONFLICT (content): Merge conflict in lisp/erc/erc-log.el
Auto-merging lisp/epa.el
CONFLICT (content): Merge conflict in lisp/epa.el
Auto-merging lisp/emacs-lisp/warnings.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/warnings.el
Auto-merging lisp/emacs-lisp/timer-list.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/timer-list.el
Auto-merging lisp/emacs-lisp/package.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/package.el
Auto-merging lisp/emacs-lisp/lisp.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/lisp.el
Auto-merging lisp/emacs-lisp/eldoc.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/eldoc.el
Auto-merging lisp/emacs-lisp/edebug.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/edebug.el
Auto-merging lisp/emacs-lisp/easy-mmode.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/easy-mmode.el
Auto-merging lisp/emacs-lisp/byte-opt.el
CONFLICT (content): Merge conflict in lisp/emacs-lisp/byte-opt.el
Auto-merging lisp/doc-view.el
CONFLICT (content): Merge conflict in lisp/doc-view.el
Auto-merging lisp/display-fill-column-indicator.el
CONFLICT (content): Merge conflict in lisp/display-fill-column-indicator.el
Auto-merging lisp/disp-table.el
CONFLICT (content): Merge conflict in lisp/disp-table.el
Auto-merging lisp/custom.el
CONFLICT (content): Merge conflict in lisp/custom.el
Auto-merging lisp/cus-edit.el
CONFLICT (content): Merge conflict in lisp/cus-edit.el
Auto-merging lisp/cedet/semantic/tag.el
CONFLICT (content): Merge conflict in lisp/cedet/semantic/tag.el
Auto-merging lisp/calc/calcalg3.el
CONFLICT (content): Merge conflict in lisp/calc/calcalg3.el
Auto-merging lisp/bookmark.el
CONFLICT (content): Merge conflict in lisp/bookmark.el
Auto-merging lisp/arc-mode.el
CONFLICT (content): Merge conflict in lisp/arc-mode.el
Auto-merging etc/themes/modus-vivendi-theme.el
CONFLICT (add/add): Merge conflict in etc/themes/modus-vivendi-theme.el
Auto-merging etc/themes/modus-operandi-theme.el
CONFLICT (add/add): Merge conflict in etc/themes/modus-operandi-theme.el
Auto-merging etc/PROBLEMS
CONFLICT (content): Merge conflict in etc/PROBLEMS
Auto-merging etc/NEWS.27
CONFLICT (add/add): Merge conflict in etc/NEWS.27
Auto-merging etc/NEWS
CONFLICT (content): Merge conflict in etc/NEWS
Auto-merging doc/misc/tramp.texi
CONFLICT (content): Merge conflict in doc/misc/tramp.texi
Auto-merging doc/misc/gnus.texi
CONFLICT (content): Merge conflict in doc/misc/gnus.texi
Auto-merging doc/lispref/internals.texi
CONFLICT (content): Merge conflict in doc/lispref/internals.texi
Auto-merging doc/emacs/package.texi
CONFLICT (content): Merge conflict in doc/emacs/package.texi
Auto-merging doc/emacs/frames.texi
CONFLICT (content): Merge conflict in doc/emacs/frames.texi
Auto-merging configure.ac
CONFLICT (content): Merge conflict in configure.ac
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.
~/Programming/Software/emacs $

Re: Integration of dictionary package

[Eli Zaretskii]

> Date: Thu, 19 Nov 2020 23:39:58 +0300
> From: Jean Louis <bugs@gnu.support>
> Cc: emacs.nolkaf@hilbrich.tk, orontee@gmail.com, emacs-devel@gnu.org
> 
> I did:
> 
> git reset -hard master
> 
> git checkout -b feature/integration-of-dictionary-el
> 
> git pull origin feature/integration-of-dictionary-el

I think instead of the last command you needed to do just "git pull".

Re: Integration of dictionary package

[Jean Louis]

* Eli Zaretskii <eliz@gnu.org> [2020-11-19 23:47]:
> > Date: Thu, 19 Nov 2020 23:39:58 +0300
> > From: Jean Louis <bugs@gnu.support>
> > Cc: emacs.nolkaf@hilbrich.tk, orontee@gmail.com, emacs-devel@gnu.org
> > 
> > I did:
> > 
> > git reset -hard master
> > 
> > git checkout -b feature/integration-of-dictionary-el
> > 
> > git pull origin feature/integration-of-dictionary-el
> 
> I think instead of the last command you needed to do just "git pull".

I have tried, then it said I had to be explicit with the branch.

git checkout feature/integration-of-dictionary-el
Switched to branch 'feature/integration-of-dictionary-el'
~/Programming/Software/emacs $ git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> feature/integration-of-dictionary-el

Re: Integration of dictionary package

[Jean Louis]

I have got the 2 files from git and I am testing it. It works fine as
usual.

In comparison with one other dictionary package wordnut for Wordnet
dictionary Wordnet search for definitions of a word in the definition
buffer automatically with RET. I need not invoke M-x again.

That feature of quickly going to definitions of words within
definition I find very useful. 

Another thing is if "Define word" as Tool menu can be added?

Re: Integration of dictionary package

[Jean Louis]

I see that in dictionary buffer the buttons are activated by 3rd mouse
button.

It is more intuitive if it is first mouse button.

Re: Integration of dictionary package

[Jean Louis]

After "word not found" when dictionary is selected like world02, then
if word is not found it asks me this below and moves my cursor from
[Search Definition] to down, to the blank space below.


[Back] [Search Definition]         [Matching words]        [Quit]
       [Select Dictionary]         [Select Match Strategy]

Word not found, maybe you are looking for one of these words

MY CURSOR MOVED HERE AND HERE WAS EMPTY 

If word is not found, and there is no other word, then maybe that
text: ", maybe you are looking for one of these words" is not
necessary.

If my cursor was on Search Definition but word is not found, maybe
cursor should remain where it was.

Re: Integration of dictionary package

[Jean Louis]

?boobytrapped?

Some words appear with question marks. Do you know why is it so?

Re: Integration of dictionary package

[Torsten Hilbrich]

On 20.11.20 03:32, Jean Louis wrote:
> ?boobytrapped?
> 
> Some words appear with question marks. Do you know why is it so?
> 

I found examples of this in the jargon file. It seems to be some kind of
emphasis of the text. I compared with pure html versions and it seems
that there single quotes are used, like in
http://www.catb.org/jargon/html/F/foo.html

dict: ?Fucked Up Beyond All Repair?
html: ‘Fucked Up Beyond All Repair’

This seems to be caused by the convertion process of the jargon file
into the dictionary format (maybe by limitations of ASCII).

We could do some post-processing on the text returned by the server
(which is already done to mark links). But the pattern would be quite
complex and most likely specific to the dictionary used.

	Torsten

Re: Integration of dictionary package

[Jean Louis]

* Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-20 08:29]:
> On 20.11.20 03:32, Jean Louis wrote:
> > ?boobytrapped?
> > 
> > Some words appear with question marks. Do you know why is it so?
> > 
> 
> I found examples of this in the jargon file. It seems to be some kind of
> emphasis of the text. I compared with pure html versions and it seems
> that there single quotes are used, like in
> http://www.catb.org/jargon/html/F/foo.html
> 
> dict: ?Fucked Up Beyond All Repair?
> html: ‘Fucked Up Beyond All Repair’
> 
> This seems to be caused by the convertion process of the jargon file
> into the dictionary format (maybe by limitations of ASCII).
> 
> We could do some post-processing on the text returned by the server
> (which is already done to mark links). But the pattern would be quite
> complex and most likely specific to the dictionary used.

If that is not bug in your package then maybe it is in how dictd
outputs those chars. If it outputs question marks, than is better
leaving it as future may bring enhancement from server side.

If package does not interpret some char and is replacing it with
question mark then it could be bug.

Re: Integration of dictionary package

[Torsten Hilbrich]

On 20.11.20 06:36, Jean Louis wrote:
> * Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-20 08:29]:
>> On 20.11.20 03:32, Jean Louis wrote:
>>> ?boobytrapped?
>>>
>>> Some words appear with question marks. Do you know why is it so?
>>>
>>
>> I found examples of this in the jargon file. It seems to be some kind of
>> emphasis of the text. I compared with pure html versions and it seems
>> that there single quotes are used, like in
>> http://www.catb.org/jargon/html/F/foo.html
>>
>> dict: ?Fucked Up Beyond All Repair?
>> html: ‘Fucked Up Beyond All Repair’
>>
>> This seems to be caused by the convertion process of the jargon file
>> into the dictionary format (maybe by limitations of ASCII).
>>
>> We could do some post-processing on the text returned by the server
>> (which is already done to mark links). But the pattern would be quite
>> complex and most likely specific to the dictionary used.
> 
> If that is not bug in your package then maybe it is in how dictd
> outputs those chars. If it outputs question marks, than is better
> leaving it as future may bring enhancement from server side.

Here is an excerpt from asking the server directly:

torsten@t460:~$ telnet dict.org 2628
Trying 199.48.130.6...
Connected to dict.org.
Escape character is '^]'.
220 dict.dict.org dictd 1.12.1/rf on Linux 4.19.0-10-amd64 <auth.mime> <269222.19371.1605854343@dict.dict.org>
define jargon foo
150 1 definitions retrieved
151 "foo" jargon "The Jargon File (version 4.4.7, 29 Dec 2003)"
foo
 /foo/

    1. interj. Term of disgust.

    2. [very common] Used very generally as a sample name for absolutely
    anything, esp. programs and files (esp. scratch files).

    3. First on the standard list of {metasyntactic variable}s used in syntax
    examples. See also {bar}, {baz}, {qux}, {quux}, {garply}, {waldo}, {fred},
    {plugh}, {xyzzy}, {thud}.

    When ?foo? is used in connection with ?bar? it has generally traced to the
    WWII-era Army slang acronym {FUBAR} (?Fucked Up Beyond All Repair? or
    ?Fucked Up Beyond All Recognition?), later modified to {foobar}. Early
    versions of the Jargon File interpreted this change as a post-war
    bowdlerization, but it it now seems more likely that FUBAR was itself a
    derivative of ?foo? perhaps influenced by German furchtbar (terrible) ?
    ?foobar? may actually have been the original form.
...

So they originate in the server. And the "OPTION MIME" does not change the behaviour.

	Torsten

Re: Integration of dictionary package

[Eli Zaretskii]

> Date: Fri, 20 Nov 2020 05:32:06 +0300
> From: Jean Louis <bugs@gnu.support>
> Cc: orontee@gmail.com, emacs-devel@gnu.org
> 
> ?boobytrapped?
> 
> Some words appear with question marks. Do you know why is it so?

Is this in a GUI frame or a TTY frame?  If the latter, it can be a
character that cannot be displayed.

Re: Integration of dictionary package

[Jean Louis]

* Eli Zaretskii <eliz@gnu.org> [2020-11-20 11:03]:
> > Date: Fri, 20 Nov 2020 05:32:06 +0300
> > From: Jean Louis <bugs@gnu.support>
> > Cc: orontee@gmail.com, emacs-devel@gnu.org
> > 
> > ?boobytrapped?
> > 
> > Some words appear with question marks. Do you know why is it so?
> 
> Is this in a GUI frame or a TTY frame?  If the latter, it can be a
> character that cannot be displayed.

I tested on GUI. Torsten said it comes that way from server if I
understood it well.

Re: Integration of dictionary package

[Jean Louis]

Keep choices during session:[1]
----------------------------

When I select dictionary and bury the buffer like with quit button,
then the selected dictionary is erased.

My expectation is that selected dictionary remains at least during
the session until I change it. Let us say somebody translates words,
then each time new word need to be translated user would again need to
select dictionary.

This same should apply for [Select Match Strategy] as if I already
select "Match substring occurring anywhere in a headword" then I
expect as user that match strategy remains at least for the session
time, and not that I need to re-select it again. I would not even find
or know that some definition did exist for substring.

Failed to open server localhost, continue with dict.org (y/n)?
--------------------------------------------------------------

If user says one time here, then at least during Emacs session this
need not be asked again, unless user sets it up to be let us say
localhost. 

Matching strategy
-----------------

Matching strategy could be customizable, I am not sure if it is, is
it?

When I already say for example: .


[quit] button:
--------------

Just like M-x calendar and some other features I think there is no
need to really kill the *Dictionary* buffer. It better remains in
memory. When user click on [quit] it would bury the buffer but it
would not kill it.

By doing so, also the above first problem with remembering of choices
would be partially solved, but I do not think this should be solution
for the choices problem during Emacs session. Choices should be
remembered during Emacs session even if *Dictionary* buffer is
killed. See above [1].


Regarding selection of dictionary
---------------------------------

For this here:

Please select your default dictionary:

*: All dictionaries
!: The first matching dictionary

I do not understand what "*" and "!" should mean for the user. I can
see that selection can be done with ENTER (mouse should work with 1st
mouse button, but does not).

Those symbols ! and * maybe indicate something else as for underlying
choices with the dict server. But to me as user they indicate possibly
to press those keys to select a dictionary.

Selection of dictionary after definition not found
--------------------------------------------------

When I search for definition but definition is not found there is
error: if: No match for "customizable" with strategy "." in dictionary "*".

(Now I wonder why is that word not found)

1. If word is not found and there are no other words, then that part
   of sentence ", maybe you are looking for one of these words" should
   be removed as already mentioned.

2. But now, when word is not found, and user did not use All
   dictionaries as option, upon [select dictionary] thereafter same
   word should be searched. Now I see this does happen, but do not
   know why it does not happen all times.

   1. I selected already All dictionaries
   2. [Search Definition] I enter: customizable
   3. Word not found, maybe you are looking for one of these words
      if: No match for "customizable" with strategy "." in dictionary "*".
   4. [Select Dictionary] All dictionaries
   5. Now I get definitions

   Something is wrong with this workflow as first I do not get
   anything.

   If I again [Search definition] I will again get word not
   found. Which is not logical.

Capitalization of buttons
-------------------------

[Back] [Search Definition]         [Matching words]        [Quit]
       [Select Dictionary]         [Select Match Strategy]

While buttons are fine, maybe they need not be capitalized as titles,
maybe no capitalization is necessary or just first word.

Matching words is not capitalized as other buttons, it's not
consistent.

[Matching words] question
-------------------------

If I already select match strategy to be substring, then if I go for
"Search definition" and write "tayl" (expecting taylor) I do not find
there "taylor", I find other choices.

I am myself not sure of differences and wording "Matching words"
because "Search definition" is call for action but "Matching words" is
not call for action.

I would like to understand the difference and why "Search definition"
is not following "Match Strategy" and why I need to use "Matching
words" to follow "Match Strategy".

And then some native English speaker to say if that button sounds
right "Matching Words".

Involve TAB to jump from button to button, from marked word to marked word
--------------------------------------------------------------------------

I see that TAB gives me error: "There is no next link"

Instead to look for some links, it should jump in the first 2 lines,
if there are buttons shown from button to button and after buttons, it
should jump from marked (yellow) word to marked word so that user may
quickly get to the choices.

Re: Integration of dictionary package

[Torsten Hilbrich]

On 20.11.20 04:11, Jean Louis wrote:
> Keep choices during session:[1]
> ----------------------------
> 
> When I select dictionary and bury the buffer like with quit button,
> then the selected dictionary is erased.
> 
> My expectation is that selected dictionary remains at least during
> the session until I change it. Let us say somebody translates words,
> then each time new word need to be translated user would again need to
> select dictionary.
> 
> This same should apply for [Select Match Strategy] as if I already
> select "Match substring occurring anywhere in a headword" then I
> expect as user that match strategy remains at least for the session
> time, and not that I need to re-select it again. I would not even find
> or know that some definition did exist for substring.´

The current dictionary and the matching strategy are buffer-local
variables (dictionary-default-strategy and dictionary-default-strategy).
As the buffer is closed when pressing the quit button this setting is
then lost.

> 
> Failed to open server localhost, continue with dict.org (y/n)?
> --------------------------------------------------------------
> 
> If user says one time here, then at least during Emacs session this
> need not be asked again, unless user sets it up to be let us say
> localhost. 

This could be modified, in this case I could set the variable
dictionary-server to preserve the user's choice (without storing it
permanently).

> 
> Matching strategy
> -----------------
> 
> Matching strategy could be customizable, I am not sure if it is, is
> it?

You can customize-variable dictionary-default-strategy. However, the RFC
only requires the "exact" and "prefix" strategy and to provide a default
strategy when "." is used. So a customisation could only provide a value
list of these special values and maybe a user-supplied ones.

All other strategy can be queried by the server and set for this
specific dictionary buffer.


> When I already say for example: .
> 
> 
> [quit] button:
> --------------
> 
> Just like M-x calendar and some other features I think there is no
> need to really kill the *Dictionary* buffer. It better remains in
> memory. When user click on [quit] it would bury the buffer but it
> would not kill it.
> 
> By doing so, also the above first problem with remembering of choices
> would be partially solved, but I do not think this should be solution
> for the choices problem during Emacs session. Choices should be
> remembered during Emacs session even if *Dictionary* buffer is
> killed. See above [1].

You can customize-variable dictionary-use-single-buffer

> Regarding selection of dictionary
> ---------------------------------
> 
> For this here:
> 
> Please select your default dictionary:
> 
> *: All dictionaries
> !: The first matching dictionary
> 
> I do not understand what "*" and "!" should mean for the user. I can
> see that selection can be done with ENTER (mouse should work with 1st
> mouse button, but does not).
> 
> Those symbols ! and * maybe indicate something else as for underlying
> choices with the dict server. But to me as user they indicate possibly
> to press those keys to select a dictionary.

"*" and "!" are special dictionary names within the dict protocol.

> 
> Selection of dictionary after definition not found
> --------------------------------------------------
> 
> When I search for definition but definition is not found there is
> error: if: No match for "customizable" with strategy "." in dictionary "*".
> 
> (Now I wonder why is that word not found)
> 
> 1. If word is not found and there are no other words, then that part
>    of sentence ", maybe you are looking for one of these words" should
>    be removed as already mentioned.

This needs some code changes but could be fixed.

> 
> 2. But now, when word is not found, and user did not use All
>    dictionaries as option, upon [select dictionary] thereafter same
>    word should be searched. Now I see this does happen, but do not
>    know why it does not happen all times.
> 
>    1. I selected already All dictionaries
>    2. [Search Definition] I enter: customizable
>    3. Word not found, maybe you are looking for one of these words
>       if: No match for "customizable" with strategy "." in dictionary "*".
>    4. [Select Dictionary] All dictionaries
>    5. Now I get definitions
> 
>    Something is wrong with this workflow as first I do not get
>    anything.
> 
>    If I again [Search definition] I will again get word not
>    found. Which is not logical.

Selecting a dictionary only does that. No search is performed then. When
after selecting the dictionary some search result is shown this is the
result of the previously performed search.

> 
> Capitalization of buttons
> -------------------------
> 
> [Back] [Search Definition]         [Matching words]        [Quit]
>        [Select Dictionary]         [Select Match Strategy]
> 
> While buttons are fine, maybe they need not be capitalized as titles,
> maybe no capitalization is necessary or just first word.
> 
> Matching words is not capitalized as other buttons, it's not
> consistent.

I agree, it should be consistent. I think I will change it to uppercase
the first word only.

> 
> [Matching words] question
> -------------------------
> 
> If I already select match strategy to be substring, then if I go for
> "Search definition" and write "tayl" (expecting taylor) I do not find
> there "taylor", I find other choices.>
> I am myself not sure of differences and wording "Matching words"
> because "Search definition" is call for action but "Matching words" is
> not call for action.

I could rename it to "Find matching words". There is enough space avaiable.

> 
> I would like to understand the difference and why "Search definition"
> is not following "Match Strategy" and why I need to use "Matching
> words" to follow "Match Strategy".

Match strategy is only used when finding matching words. Search
definition only perform a simple lookup without the option for
specifying how to match against the list of words.

See https://tools.ietf.org/html/rfc2229 if you are interested in more
details.

> 
> And then some native English speaker to say if that button sounds
> right "Matching Words".
> 
> Involve TAB to jump from button to button, from marked word to marked word
> --------------------------------------------------------------------------
> 
> I see that TAB gives me error: "There is no next link"
> 
> Instead to look for some links, it should jump in the first 2 lines,
> if there are buttons shown from button to button and after buttons, it
> should jump from marked (yellow) word to marked word so that user may
> quickly get to the choices.

At least in the version within the emacs repository the tab key is
wrapping around through all the buttons and links used. There I use the
button library to provide the functionality for the function buttons at
the top and the links to word definitions in the text.

	Torsten

Re: Integration of dictionary package

[Jean Louis]

* Torsten Hilbrich <emacs.nolkaf@hilbrich.tk> [2020-11-20 08:57]:
> On 20.11.20 04:11, Jean Louis wrote:
> > Keep choices during session:[1]
> > ----------------------------
> > 
> > When I select dictionary and bury the buffer like with quit button,
> > then the selected dictionary is erased.
> > 
> > My expectation is that selected dictionary remains at least during
> > the session until I change it. Let us say somebody translates words,
> > then each time new word need to be translated user would again need to
> > select dictionary.
> > 
> > This same should apply for [Select Match Strategy] as if I already
> > select "Match substring occurring anywhere in a headword" then I
> > expect as user that match strategy remains at least for the session
> > time, and not that I need to re-select it again. I would not even find
> > or know that some definition did exist for substring.´
> 
> The current dictionary and the matching strategy are buffer-local
> variables (dictionary-default-strategy and dictionary-default-strategy).
> As the buffer is closed when pressing the quit button this setting is
> then lost.

Thank you.

OK and that is fine, but then do not kill the buffer by key q, just
bury it instead. 

> > Failed to open server localhost, continue with dict.org (y/n)?
> > --------------------------------------------------------------
> > 
> > If user says one time here, then at least during Emacs session this
> > need not be asked again, unless user sets it up to be let us say
> > localhost. 
> 
> This could be modified, in this case I could set the variable
> dictionary-server to preserve the user's choice (without storing it
> permanently).

For the duration of Emacs session yes. And if user maybe changes it
during session I guess it will be automatically used.

> > Matching strategy
> > -----------------
> > 
> > Matching strategy could be customizable, I am not sure if it is, is
> > it?
> 
> You can customize-variable dictionary-default-strategy. However, the RFC
> only requires the "exact" and "prefix" strategy and to provide a default
> strategy when "." is used. So a customisation could only provide a value
> list of these special values and maybe a user-supplied ones.
> 
> All other strategy can be queried by the server and set for this
> specific dictionary buffer.

I understand. Also here is helpful not to kill buffer by q.

> > When I already say for example: .
> > 
> > 
> > [quit] button:
> > --------------
> > 
> > Just like M-x calendar and some other features I think there is no
> > need to really kill the *Dictionary* buffer. It better remains in
> > memory. When user click on [quit] it would bury the buffer but it
> > would not kill it.
> > 
> > By doing so, also the above first problem with remembering of choices
> > would be partially solved, but I do not think this should be solution
> > for the choices problem during Emacs session. Choices should be
> > remembered during Emacs session even if *Dictionary* buffer is
> > killed. See above [1].
> 
> You can customize-variable dictionary-use-single-buffer

I do have that as T. But is not related.

When you press q the buffer is killed, that means the selected
dictionary, match stragegy and the word displayed in the buffer is
gone.

Instead, for q you can just bury the buffer, it need not be killed but
just removed from the screen similar like how many other modes do.

Like M-x grep, if I press q, the *grep* buffer is still in memory but
I just do not see it. I can at any time come back to it.

> "*" and "!" are special dictionary names within the dict protocol.

Alright, I was thinking so.

> >    1. I selected already All dictionaries
> >    2. [Search Definition] I enter: customiozable
> >    3. Word not found, maybe you are looking for one of these words
> >       if: No match for "customizable" with strategy "." in dictionary "*".
> >    4. [Select Dictionary] All dictionaries
> >    5. Now I get definitions
> > 
> >    Something is wrong with this workflow as first I do not get
> >    anything.
> > 
> >    If I again [Search definition] I will again get word not
> >    found. Which is not logical.
> 
> Selecting a dictionary only does that. No search is performed then. When
> after selecting the dictionary some search result is shown this is the
> result of the previously performed search.

Only that something is maybe wrong there, I have given the
recipe. 

> At least in the version within the emacs repository the tab key is
> wrapping around through all the buttons and links used. There I use the
> button library to provide the functionality for the function buttons at
> the top and the links to word definitions in the text.

Then it must be fine. I got the files from repository and I did not
use it in the new built Emacs, just loaded it into this one.

Thank you,
Jean

Re: Integration of dictionary package

[Eli Zaretskii]

> From: Torsten Hilbrich <emacs.nolkaf@hilbrich.tk>
> Date: Thu, 19 Nov 2020 08:40:21 +0100
> Cc: orontee@gmail.com
> 
> I have now completed the work on my branch
> feature/integration-of-dictionary-el. For reference, here is a list of
> the commits so far:

Thanks, a few minor comments:

  . Please add a NEWS entry about the package, with a couple of
    sentences describing its main features, and maybe mentioning one
    or two main commands to use it.

  . Our conventions are to make the first line of every doc string a
    complete sentence which ends with a period.  It should also
    mention the arguments of the function, if any.  I see that many
    first lines in your doc strings lack the period, and some first
    sentences take more than one line and/or don't mention the
    arguments.

Please add a NEWS entry before you merge, but the other issues can be
worked on after the merge.