branch: master
commit 0abbb7da7c7037eea1c2ef29b141b7773af84eda
Merge: 4c6cd63 4fc6181
Author: rocky <ro...@gnu.org>
Commit: rocky <ro...@gnu.org>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa
---
.gitignore | 7 ++++++
README | 23 ++++++++++++++----
copyright_exceptions | 2 ++
externals-list | 39 ++++---------------------------
packages/debbugs/debbugs-gnu.el | 2 ++
packages/excorporate/excorporate-diary.el | 2 +-
packages/excorporate/excorporate-org.el | 2 +-
7 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/.gitignore b/.gitignore
index f9fd3a0..70f4897 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,12 @@ packages/peg/
packages/posframe/
packages/psgml/
packages/python/
+packages/realgud-ipdb/
+packages/realgud-jdb/
+packages/realgud-lldb/
+packages/realgud-node-debug/
+packages/realgud-node-inspect/
+packages/realgud-trepan-ni/
packages/relint/
packages/rudel/
packages/smalltalk-mode/
@@ -55,6 +61,7 @@ packages/soap-client/
packages/sql-indent/
packages/ssh-deploy/
packages/system-packages/
+packages/tramp/
packages/w3/
packages/webfeeder/
packages/xelb/
diff --git a/README b/README
index e0c9faf..9589009 100644
--- a/README
+++ b/README
@@ -228,15 +228,28 @@ In the `external' case, the copy of the code is not kept
in `master` but in the
`externals/<pkg-name>' branch in the `elpa.git' repository.
To add a new externals package, first add this `elpa.git' repository as a
-new remote in your existing repository. Then push a local branch to a
+new remote in your existing repository.
+
+Then push a local branch to a
new remote branch in `elpa.git', named `externals/<pkgname>`. For example:
git push elpa <mybranch>:externals/<pkgname>
-Then edit the `externals-list' file as mentioned above, and push that
-change to `elpa's master branch. After it's added to the `externals-list'
-file, the package can be maintained just by pushing changes to the
-`externals/<pkgname>` branch.
+For example, let's say that you want to add `realgud-ipdb` which is currently
+checked out in `$HOME/github/realgud-ipdb`:
+
+ cd $HOME/github/realgud-ipdb
+ git remote add elpa ${USER}@git.sv.gnu.org:/srv/git/emacs/elpa.git
+ git push elpa master:refs/heads/externals/realgud-ipdb
+
+
+Then edit the `externals-list' file as mentioned above, add the line
+
+ ("realgud-ipdb" :external "https://github.com/realgud/realgud-ipdb";)
+
+and push that change to `elpa's master branch. After it's added to
+the `externals-list' file, the package can be maintained just by
+pushing changes to the `externals/<pkgname>` branch.
If you wish to check out all the external packages into the `packages'
directory, you can run the command:
diff --git a/copyright_exceptions b/copyright_exceptions
index fc321b3..0f2d2f6 100644
--- a/copyright_exceptions
+++ b/copyright_exceptions
@@ -72,6 +72,8 @@
./mmm-mode/mmm-rpm.el:;; Copyright (C) 2000 by Marcus Harnisch
<marcus.harni...@gmx.net>
./muse/htmlize-hack.el
./rudel/rudel-loaddefs.el
+./tramp/tramp-loaddefs.el
+./tramp/tramp-sh.el:;; (copyright statements below in code to be updated with
the above notice)
./uni-confusables/gen-confusables.el:;; Copyright (C) 1991-2009, 2010 Unicode,
Inc.
./uni-confusables/gen-confusables.el:;; gen-confusables.el. The copyright and
permissions are the same
./uni-confusables/gen-confusables.el:;; list (covered by the Unicode copyright
terms in copyright.html)
diff --git a/externals-list b/externals-list
index 168a423..10f9d3f 100644
--- a/externals-list
+++ b/externals-list
@@ -35,7 +35,7 @@
("auctex" :external "git://git.sv.gnu.org/auctex.git")
("bbdb" :external "git://git.savannah.nongnu.org/bbdb.git")
("bnf-mode" :external "https://github.com/sergeyklay/bnf-mode";)
- ("buffer-expose" :external "https://github.com/clemera/buffer-expose";)
+ ("buffer-expose" :external "https://github.com/clemera/buffer-expose";)
("bug-hunter" :subtree
"https://github.com/Malabarba/elisp-bug-hunter";)
;;FIXME:("cedet" :external "??")
;; ("cc-mode" :core ("lisp/progmodes/cc-align.el"
@@ -69,7 +69,7 @@
("delight" :subtree "http://git.savannah.gnu.org/r/delight.git";)
("diffview" :subtree "https://github.com/mgalgs/diffview-mode.git";)
("diff-hl" :subtree "https://github.com/dgutov/diff-hl.git";)
- ("dired-git-info" :external "https://github.com/clemera/dired-git-info";)
+ ("dired-git-info" :external "https://github.com/clemera/dired-git-info";)
("disk-usage" :external
"https://gitlab.com/ambrevar/emacs-disk-usage";)
("dismal" :external nil)
("dts-mode" :subtree "https://github.com/bgamari/dts-mode.git";)
@@ -84,7 +84,7 @@
("f90-interface-browser" :subtree "https://github.com/wence-/f90-iface";)
("flymake" :core "lisp/progmodes/flymake.el")
("fountain-mode" :external "https://github.com/rnkn/fountain-mode";)
- ("frog-menu" :external "https://github.com/clemera/frog-menu";)
+ ("frog-menu" :external "https://github.com/clemera/frog-menu";)
("ggtags" :subtree "https://github.com/leoliu/ggtags";)
("gnome-c-style" :subtree "https://github.com/ueno/gnome-c-style.git";)
("gnorb" :subtree "https://github.com/girzel/gnorb";)
@@ -119,6 +119,7 @@
("python" :core "lisp/progmodes/python.el")
;;FIXME:("org" :external ??) ;; Need to introduce snapshots!!
("realgud-ipdb" :external "https://github.com/realgud/realgud-ipdb";)
+ ("realgud-jdb" :external "https://github.com/realgud/jdb";)
("realgud-lldb" :external "https://github.com/realgud/realgud-lldb";)
("realgud-node-debug" :external
"https://github.com/realgud/realgud-node-debug";)
("realgud-node-inspect" :external
"https://github.com/realgud/realgud-node-inspect";)
@@ -137,37 +138,7 @@
("test-simple" :subtree "https://github.com/rocky/emacs-test-simple";)
("vdiff" :subtree "https://github.com/justbur/emacs-vdiff";)
("vcl-mode" :subtree "git://git.gnu.org.ua/vcl-mode")
- ;;("tramp" :core
- ;; (;; FIXME: elpa.gnu.org doesn't know where to get from
- ;; ;;"README.md"
- ;; ;; FIXME: elpa.gnu.org doesn't know where to get from
- ;; ;;"dir"
- ;; "lisp/net/tramp.el"
- ;; "lisp/net/tramp-archive.el"
- ;; "lisp/net/tramp-adb.el"
- ;; "lisp/net/tramp-cache.el"
- ;; "lisp/net/tramp-cmds.el"
- ;; "lisp/net/tramp-compat.el"
- ;; "lisp/net/tramp-ftp.el"
- ;; "lisp/net/tramp-gvfs.el"
- ;; ;; FIXME: elpa.gnu.org doesn't know how to build
- ;; "lisp/net/tramp-loaddefs.el"
- ;; "lisp/net/tramp-sh.el"
- ;; "lisp/net/tramp-smb.el"
- ;; "lisp/net/tramp-uu.el"
- ;; "lisp/net/trampver.el"
- ;; ("doc/misc/tramp.texi" "doc/tramp.texi")
- ;; ("doc/misc/trampver.texi" "doc/trampver.texi")
- ;; ;; FIXME: elpa.gnu.org doesn't know how to build
- ;; "info/tramp.info"
- ;; ("test/lisp/net/tramp-tests.el"
- ;; "test/tramp-tests.el")
- ;; ("test/lisp/net/tramp-archive-tests.el"
- ;; "test/tramp-archive-tests.el")
- ;; ("test/lisp/net/tramp-archive-resources/foo.tar.gz"
- ;; "test/tramp-archive-resources/foo.tar.gz")
- ;; ("test/lisp/net/tramp-archive-resources/foo.iso/foo"
- ;; "test/tramp-archive-resources/foo.iso/foo")))
+ ("tramp" :external
"https://git.savannah.gnu.org/cgit/tramp.git/?h=elpa";)
;;FIXME:("vlf" :subtree ??)
("w3" :external nil)
("wcheck-mode" :subtree
"https://github.com/tlikonen/wcheck-mode.git";)
diff --git a/packages/debbugs/debbugs-gnu.el b/packages/debbugs/debbugs-gnu.el
index 84f1a2e..fad31a0 100644
--- a/packages/debbugs/debbugs-gnu.el
+++ b/packages/debbugs/debbugs-gnu.el
@@ -742,6 +742,8 @@ are taken from the cache instead."
merged)
(unless (equal (cdr (assq 'pending status)) "pending")
(setq words (append words (list (cdr (assq 'pending status))))))
+ (when (cdr (assq 'fixed status))
+ (setq words (append words '("fixed"))))
(let ((packages (cdr (assq 'package status))))
(dolist (elt packages)
(when (member elt debbugs-gnu-default-packages)
diff --git a/packages/excorporate/excorporate-diary.el
b/packages/excorporate/excorporate-diary.el
index c4c94e1..a418f71 100644
--- a/packages/excorporate/excorporate-diary.el
+++ b/packages/excorporate/excorporate-diary.el
@@ -123,7 +123,7 @@ Call FINALIZE after the meeting has been inserted."
(when (not (string-match "^Cancel[l]?ed: " subject))
;; FIXME: Sometimes meetings are duplicated if they have
;; overlapping (and (diary-cyclic ...) (diary-block ...)) ranges,
- ;; e.g., on in the today file and one in the transient file.
+ ;; e.g., one in the today file and one in the transient file.
;; Maybe we should de-duplicate them in the final display. If the
;; meeting start time is sometime today then put it in today's
;; diary file, otherwise put it in the transient one.
diff --git a/packages/excorporate/excorporate-org.el
b/packages/excorporate/excorporate-org.el
index 2266161..a17d060 100644
--- a/packages/excorporate/excorporate-org.el
+++ b/packages/excorporate/excorporate-org.el
@@ -121,7 +121,7 @@ are the requested participants."
(if (save-excursion (org-goto-first-child))
(org-sort-entries t ?s)
(forward-line 3)
- (insert "`♘")))))
+ (insert "`♘\n")))))
(defun exco-org-finalize-buffer ()
"Finalize text in buffer after all connections have responded."
