[elpa] externals/org 7e1745d 1/5: lisp/ob-julia.el: Fix copyright header

[ELPA Syncer]

branch: externals/org
commit 7e1745d744e8001ef3c751dc88387b5d752dde2e
Author: Bastien 
Commit: Bastien 

lisp/ob-julia.el: Fix copyright header
---
 lisp/ob-julia.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index cbc58d6..a61e785 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -1,6 +1,6 @@
 ;;; ob-julia.el --- org-babel functions for julia code evaluation
 
-;; Copyright (C) 2013, 2014, 2021 G. Jay Kerns
+;; Copyright (C) 2013-2021 Free Software Foundation, Inc.
 ;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison
 ;; Maintainer: Pedro Bruel 
 ;; Keywords: literate programming, reproducible research, scientific computing

[elpa] externals/org updated (1583322 -> 806ac1b)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  1583322   doc/org-manual.org: Remove a couple of stray words
   new  7e1745d   lisp/ob-julia.el: Fix copyright header
   new  3a291b0   ox-publish.el: Add `org-html-publish-to-html' as the 
default publishing function
   new  a5e8dfa   Revert "ob-core.el: Add ability to use closures as 
default header arguments"
   new  9f1507b   ob-core.el: Add ability to use closures as default header 
arguments
   new  806ac1b   *el: Fix indentation


Summary of changes:
 lisp/ob-C.el|  24 +++---
 lisp/ob-R.el|  10 +--
 lisp/ob-awk.el  |  12 +--
 lisp/ob-calc.el |   2 +-
 lisp/ob-comint.el   |  64 +++
 lisp/ob-core.el |  92 +-
 lisp/ob-exp.el  |  18 ++---
 lisp/ob-forth.el|   4 +-
 lisp/ob-gnuplot.el  |  12 +--
 lisp/ob-java.el |   2 +-
 lisp/ob-julia.el|  22 +++---
 lisp/ob-latex.el|  28 +++
 lisp/ob-lilypond.el |   8 +-
 lisp/ob-ocaml.el|   4 +-
 lisp/ob-octave.el   |  14 ++--
 lisp/ob-plantuml.el |   6 +-
 lisp/ob-python.el   |   4 +-
 lisp/ob-sed.el  |  12 +--
 lisp/ob-sql.el  |  32 
 lisp/oc-csl.el  |  14 ++--
 lisp/ol-bibtex.el   |   2 +-
 lisp/ol-gnus.el |   2 +-
 lisp/ol-w3m.el  |  76 +-
 lisp/org-agenda.el  |  40 +-
 lisp/org-attach.el  |  48 ++--
 lisp/org-capture.el | 168 
 lisp/org-clock.el   |  38 -
 lisp/org-colview.el |   6 +-
 lisp/org-compat.el  |   8 +-
 lisp/org-crypt.el   |   8 +-
 lisp/org-goto.el|   6 +-
 lisp/org-habit.el   |   2 +-
 lisp/org-indent.el  |   8 +-
 lisp/org-inlinetask.el  |   4 +-
 lisp/org-lint.el|   4 +-
 lisp/org-macs.el|  21 +++--
 lisp/org-mouse.el   |  38 -
 lisp/org-plot.el|  10 +--
 lisp/org-protocol.el|   2 +-
 lisp/org-src.el |  16 ++--
 lisp/org-table.el   |  24 +++---
 lisp/org.el |   2 +-
 lisp/ox-ascii.el|   6 +-
 lisp/ox-beamer.el   |  30 +++
 lisp/ox-html.el |  34 
 lisp/ox-icalendar.el|   4 +-
 lisp/ox-latex.el|  54 ++---
 lisp/ox-man.el  |  24 +++---
 lisp/ox-md.el   |  14 ++--
 lisp/ox-odt.el  |  52 ++---
 lisp/ox-org.el  |   4 +-
 lisp/ox-publish.el  |  11 +--
 lisp/ox-texinfo.el  |   8 +-
 lisp/ox.el  |  54 ++---
 testing/lisp/test-ox-publish.el |  36 ++---
 55 files changed, 647 insertions(+), 601 deletions(-)

[elpa] externals/org 3a291b0 2/5: ox-publish.el: Add `org-html-publish-to-html' as the default publishing function

[ELPA Syncer]

branch: externals/org
commit 3a291b0f0ecec5881ee79b75ee3176ee771eccc5
Author: Yasushi SHOJI 
Commit: Bastien 

ox-publish.el: Add `org-html-publish-to-html' as the default publishing 
function

* lisp/org-macs.el (org-plist-delete-all): New function.

* lisp/ox-publish.el (org-publish-file): Add
`org-html-publish-to-html' as the default publishing function.

* testing/lisp/test-ox-publish.el (org-test-publish): Use
`org-plist-delete-all' to remove properties from the plist.

Reported-by: Christopher W. Ryan
See 

---
 lisp/org-macs.el|  5 +
 lisp/ox-publish.el  |  3 ++-
 testing/lisp/test-ox-publish.el | 36 +++-
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index bf1340b..231e29d 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -538,6 +538,11 @@ that may remove elements by altering the list structure."
 (setq list (delete (pop elts) list)))
   list)
 
+(defun org-plist-delete-all (plist props)
+  "Delete all elements in PROPS from PLIST."
+  (dolist (e props plist)
+(setq plist (org-plist-delete plist e
+
 (defun org-plist-delete (plist property)
   "Delete PROPERTY from PLIST.
 This is in contrast to merely setting it to 0."
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index c25dd54..99b1dca 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -617,7 +617,8 @@ files, when entire projects are published (see
  (abbreviate-file-name filename
 (project-plist (cdr project))
 (publishing-function
- (pcase (org-publish-property :publishing-function project)
+ (pcase (org-publish-property :publishing-function project
+   'org-html-publish-to-html)
(`nil (user-error "No publishing function chosen"))
((and f (pred listp)) f)
(f (list f
diff --git a/testing/lisp/test-ox-publish.el b/testing/lisp/test-ox-publish.el
index 3503174..18e6f5e 100644
--- a/testing/lisp/test-ox-publish.el
+++ b/testing/lisp/test-ox-publish.el
@@ -22,12 +22,16 @@
 
 ;;; Helper functions
 
-(defun org-test-publish (properties handler)
+(defun org-test-publish (properties handler &optional remove-prop)
   "Publish a project defined by PROPERTIES.
 Call HANDLER with the publishing directory as its sole argument.
 Unless set otherwise in PROPERTIES, `:base-directory' is set to
 \"examples/pub/\" sub-directory from test directory and
-`:publishing-function' is set to `org-publish-attachment'."
+`:publishing-function' is set to `org-publish-attachment'.
+Because `org-publish-property' uses `plist-member' to check the
+existence of a property, a property with a value nil is different
+from a non-existing property.  Properties in REMOVE-PROP will be
+removed from the final plist."
   (declare (indent 1))
   (let* ((org-publish-use-timestamps-flag nil)
 (org-publish-cache nil)
@@ -35,13 +39,15 @@ Unless set otherwise in PROPERTIES, `:base-directory' is 
set to
 (pub-dir (make-temp-file "org-test" t))
 (org-publish-timestamp-directory
  (expand-file-name ".org-timestamps/" pub-dir))
+ (props (org-plist-delete-all
+ (org-combine-plists
+  `(:base-directory ,base-dir
+:publishing-function org-publish-attachment)
+  properties
+  `(:publishing-directory ,pub-dir))
+ remove-prop))
 (project
- `("test" ,@(org-combine-plists
- `(:base-directory
-   ,base-dir
-   :publishing-function org-publish-attachment)
- properties
- `(:publishing-directory ,pub-dir)
+ `("test" ,@props)))
 (unwind-protect
(progn
  (org-publish-projects (list project))
@@ -92,7 +98,19 @@ Unless set otherwise in PROPERTIES, `:base-directory' is set 
to
(lambda (dir)
  (remove ".org-timestamps"
  (cl-remove-if #'file-directory-p
-   (directory-files dir
+   (directory-files dir)))
+
+  ;; Check the default trasformation function,
+  ;; org-html-publish-to-html. Because org-test-publish uses
+  ;; org-publish-attachment by default, we must not just override with
+  ;; nil but tell it to remove the :publishing-function from the list.
+  (should
+   (let ((func (lambda (dir)
+ (with-temp-buffer
+   (insert-file-contents (expand-file-name "a.html" dir))
+   (buffer-string)
+(equal (org-test-publish nil func '(:publishing-function))
+   (org-test-publish '(:publishing-function org-html-publish-to-html) 
func

[elpa] externals/org a5e8dfa 3/5: Revert "ob-core.el: Add ability to use closures as default header arguments"

[ELPA Syncer]

branch: externals/org
commit a5e8dfaf5be72984925b759e06ab9812b032ad07
Author: Bastien 
Commit: Bastien 

Revert "ob-core.el: Add ability to use closures as default header arguments"

This reverts commit 78783f4e47901255695031dae0efcbb301a40878.
---
 lisp/ob-core.el | 32 ++--
 lisp/ob-exp.el  |  2 +-
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index b039d32..c8380f7 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -472,23 +472,7 @@ For the format of SAFE-LIST, see 
`org-babel-safe-header-args'."
 (defvar org-babel-default-header-args
   '((:session . "none") (:results . "replace") (:exports . "code")
 (:cache . "no") (:noweb . "no") (:hlines . "no") (:tangle . "no"))
-  "Default arguments to use when evaluating a source block.
-
-This is a list in which each element is an alist.  Each key
-corresponds to a header argument, and each value to that header's
-value.  The value can either be a string or a closure that
-evaluates to a string at runtime.  For instance, imagine you'd
-like to set the file name output of a latex source block to a
-sha1 of its contents.  We could achieve this with:
-
-(defun org-src-sha ()
-  (let ((elem (org-element-at-point)))
-(concat (sha1 (org-element-property :value elem)) \".svg\")))
-
-(setq org-babel-default-header-args:latex
-  `((:results . \"file link replace\")
-(:file . (lambda () (org-src-sha)")
-
+  "Default arguments to use when evaluating a source block.")
 (put 'org-babel-default-header-args 'safe-local-variable
  (org-babel-header-args-safe-fn org-babel-safe-header-args))
 
@@ -599,18 +583,6 @@ the outer-most code block.")
 
 (defvar *this*)
 
-(defun eval-default-headers (headers)
-  "Compute default header list set with HEADERS.
-
-  Evaluate all default header arguments set to functions prior to
-  returning the list of header arguments."
-  (let ((lst nil))
-(dolist (elem (eval headers t))
-  (if (listp (cdr elem))
-  (push `(,(car elem) . ,(funcall (cdr elem))) lst)
-(push elem lst)))
-lst))
-
 (defun org-babel-get-src-block-info (&optional light datum)
   "Extract information from a source block or inline source block.
 
@@ -642,7 +614,7 @@ a list with the following pattern:
   (apply #'org-babel-merge-params
  (if inline org-babel-default-inline-header-args
org-babel-default-header-args)
- (and (boundp lang-headers) (eval-default-headers 
lang-headers))
+ (and (boundp lang-headers) (eval lang-headers t))
  (append
   ;; If DATUM is provided, make sure we get node
   ;; properties applicable to its location within
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 151ae71..e9b304b 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -104,7 +104,7 @@ Assume point is at block opening line."
   (apply #'org-babel-merge-params
  org-babel-default-header-args
  (and (boundp lang-headers)
-  (eval-default-headers lang-headers))
+  (symbol-value lang-headers))
  (append (org-babel-params-from-properties lang)
  (list raw-params)))
  (setf hash (org-babel-sha1-hash info :export)))

[elpa] externals/org 806ac1b 5/5: *el: Fix indentation

[ELPA Syncer]

branch: externals/org
commit 806ac1b7f642063f65e912806667a55397203823
Author: Bastien 
Commit: Bastien 

*el: Fix indentation
---
 lisp/ob-C.el   |  24 +++
 lisp/ob-R.el   |  10 +--
 lisp/ob-awk.el |  12 ++--
 lisp/ob-calc.el|   2 +-
 lisp/ob-comint.el  |  64 +--
 lisp/ob-core.el|  40 ++--
 lisp/ob-exp.el |  16 ++---
 lisp/ob-forth.el   |   4 +-
 lisp/ob-gnuplot.el |  12 ++--
 lisp/ob-java.el|   2 +-
 lisp/ob-julia.el   |  20 +++---
 lisp/ob-latex.el   |  28 -
 lisp/ob-lilypond.el|   8 +--
 lisp/ob-ocaml.el   |   4 +-
 lisp/ob-octave.el  |  14 ++---
 lisp/ob-plantuml.el|   6 +-
 lisp/ob-python.el  |   4 +-
 lisp/ob-sed.el |  12 ++--
 lisp/ob-sql.el |  32 +-
 lisp/oc-csl.el |  14 ++---
 lisp/ol-bibtex.el  |   2 +-
 lisp/ol-gnus.el|   2 +-
 lisp/ol-w3m.el |  76 +++---
 lisp/org-agenda.el |  40 ++--
 lisp/org-attach.el |  48 +++---
 lisp/org-capture.el| 168 -
 lisp/org-clock.el  |  38 +--
 lisp/org-colview.el|   6 +-
 lisp/org-compat.el |   8 +--
 lisp/org-crypt.el  |   8 +--
 lisp/org-goto.el   |   6 +-
 lisp/org-habit.el  |   2 +-
 lisp/org-indent.el |   8 +--
 lisp/org-inlinetask.el |   4 +-
 lisp/org-lint.el   |   4 +-
 lisp/org-macs.el   |  16 ++---
 lisp/org-mouse.el  |  38 +--
 lisp/org-plot.el   |  10 +--
 lisp/org-protocol.el   |   2 +-
 lisp/org-src.el|  16 ++---
 lisp/org-table.el  |  24 +++
 lisp/org.el|   2 +-
 lisp/ox-ascii.el   |   6 +-
 lisp/ox-beamer.el  |  30 -
 lisp/ox-html.el|  34 +-
 lisp/ox-icalendar.el   |   4 +-
 lisp/ox-latex.el   |  54 
 lisp/ox-man.el |  24 +++
 lisp/ox-md.el  |  14 ++---
 lisp/ox-odt.el |  52 +++
 lisp/ox-org.el |   4 +-
 lisp/ox-publish.el |   8 +--
 lisp/ox-texinfo.el |   8 +--
 lisp/ox.el |  54 
 54 files changed, 574 insertions(+), 574 deletions(-)

diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index 2878484..842e0d3 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -478,18 +478,18 @@ specifying a variable with the name of the table."
 ((or `c `cpp) "const char*")
 (`d "string"))
 (concat
-  (pcase org-babel-c-variant
-   ((or `c `cpp)
- (format "const char* %s_header[%d] = {%s};"
- table
- (length headers)
- (mapconcat (lambda (h) (format "\"%s\"" h)) headers ",")))
-   (`d
- (format "string[%d] %s_header = [%s];"
- (length headers)
- table
- (mapconcat (lambda (h) (format "\"%s\"" h)) headers ","
-  "\n"
+ (pcase org-babel-c-variant
+   ((or `c `cpp)
+(format "const char* %s_header[%d] = {%s};"
+table
+(length headers)
+(mapconcat (lambda (h) (format "\"%s\"" h)) headers ",")))
+   (`d
+(format "string[%d] %s_header = [%s];"
+(length headers)
+table
+(mapconcat (lambda (h) (format "\"%s\"" h)) headers ","
+ "\n"
  (pcase org-babel-c-variant
((or `c `cpp)
(format
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 6389e12..db52773 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -324,7 +324,7 @@ Each member of this list is a list with three members:
 (device-info (or (assq (intern (concat ":" device))
org-babel-R-graphics-devices)
   (assq :png org-babel-R-graphics-devices)))
-(extra-args (cdr (assq :R-dev-args params))) filearg args)
+ (extra-args (cdr (assq :R-dev-args params))) filearg args)
 (setq device (nth 1 device-info))
 (setq filearg (nth 2 device-info))
 (setq args (mapconcat
@@ -373,14 +373,14 @@ Has four %s escapes to be filled in:
 4. The name of the file to write to")
 
 (defun org-babel-R-evaluate
-  (session body result-type result-params column-names-p row-names-p async)
+(session body result-type result-params column-names-p row-names-p async)
   "Evaluate R code in BODY."
   (if session
   (if async
   (ob-session-async-org-babel-R-evaluate-session
session body result-type result-params column-names-p row-names-p)
-  (org-babel-R-evaluate-session
-   session body result-type result-params column-names-p row-names-p))
+(org-babel-R-evaluate-session
+ session body result-type result-params column-names-p row-names-p))
 (org-babel-R-evaluate-external-process
  body result-type result-params column-names-p row-names-p)))
 
@@ -521,7 +521,7 @@ by `org-babel-comint-a

[elpa] externals/org 9f1507b 4/5: ob-core.el: Add ability to use closures as default header arguments

[ELPA Syncer]

branch: externals/org
commit 9f1507bdd1d3e902396bedab8318f30dac63df57
Author: Matt Huszagh 
Commit: Bastien 

ob-core.el: Add ability to use closures as default header arguments

* lisp/ob-core.el (org-babel-default-header-args): Document ability to
use closures.
(org-babel-eval-headers): New function to generate header arguments,
which adds the ability to evaluate closures during source block
execution or export.
(org-babel-merge-params): Only evaluate closures when we have our
final list of headers.
---
 lisp/ob-core.el | 60 -
 1 file changed, 55 insertions(+), 5 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index c8380f7..bdc11d2 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -472,7 +472,35 @@ For the format of SAFE-LIST, see 
`org-babel-safe-header-args'."
 (defvar org-babel-default-header-args
   '((:session . "none") (:results . "replace") (:exports . "code")
 (:cache . "no") (:noweb . "no") (:hlines . "no") (:tangle . "no"))
-  "Default arguments to use when evaluating a source block.")
+  "Default arguments to use when evaluating a source block.
+
+This is a list in which each element is an alist.  Each key
+corresponds to a header argument, and each value to that header's
+value.  The value can either be a string or a closure that
+evaluates to a string.  The closure is evaluated when the source
+block is being evaluated (e.g. during execution or export), with
+point at the source block.  It is not possible to use an
+arbitrary function symbol (e.g. 'some-func), since org uses
+lexical binding.  To achieve the same functionality, call the
+function within a closure (e.g. (lambda () (some-func))).
+
+To understand how closures can be used as default header
+arguments, imagine you'd like to set the file name output of a
+latex source block to a sha1 of its contents.  We could achieve
+this with:
+
+(defun org-src-sha ()
+  (let ((elem (org-element-at-point)))
+(concat (sha1 (org-element-property :value elem)) \".svg\")))
+
+(setq org-babel-default-header-args:latex
+  `((:results . \"file link replace\")
+(:file . (lambda () (org-src-sha)
+
+Because the closure is evaluated with point at the source block,
+the call to `org-element-at-point' above will always retrieve
+information about the current source block.")
+
 (put 'org-babel-default-header-args 'safe-local-variable
  (org-babel-header-args-safe-fn org-babel-safe-header-args))
 
@@ -583,6 +611,19 @@ the outer-most code block.")
 
 (defvar *this*)
 
+(defun org-babel-eval-headers (headers)
+  "Compute header list set with HEADERS.
+
+Evaluate all header arguments set to functions prior to returning
+the list of header arguments."
+  (let ((lst nil))
+(dolist (elem headers)
+  (if (and (cdr elem)
+  (functionp (cdr elem)))
+  (push `(,(car elem) . ,(funcall (cdr elem))) lst)
+(push elem lst)))
+lst))
+
 (defun org-babel-get-src-block-info (&optional light datum)
   "Extract information from a source block or inline source block.
 
@@ -2698,12 +2739,21 @@ parameters when merging lists."
  results-exclusive-groups
  results
  (split-string
-  (if (stringp value) value (eval value t))
+  (if (stringp value)
+  value
+(if (functionp value)
+(funcall value)
+  (eval value t)))
  (`(:exports . ,value)
   (setq exports (funcall merge
  exports-exclusive-groups
  exports
- (split-string (or value "")
+ (split-string (or
+(if value
+(if (functionp value)
+(funcall value)
+  value)
+  ""))
  ;; Regular keywords: any value overwrites the previous one.
  (_ (setq params (cons pair (assq-delete-all (car pair) params)))
 ;; Handle `:var' and clear out colnames and rownames for replaced
@@ -2718,14 +2768,14 @@ parameters when merging lists."
  (cdr (assq param params
  (setq params
(cl-remove-if (lambda (pair) (and (equal (car pair) param)
-(null (cdr pair
+ (null (cdr pair
  params)
 ;; Handle other special keywords, which accept multiple values.
 (setq p

[elpa] externals/org 8db21e6: Remove and update Makefiles as contrib/ has been moved out

[ELPA Syncer]

branch: externals/org
commit 8db21e6cb39f68576e4ad8a53c169d771a4c3c62
Author: Bastien 
Commit: Bastien 

Remove and update Makefiles as contrib/ has been moved out
---
 mk/default.mk |   4 --
 mk/server.mk  | 135 --
 mk/targets.mk |  18 ++--
 3 files changed, 3 insertions(+), 154 deletions(-)

diff --git a/mk/default.mk b/mk/default.mk
index 8ab31e0..4ffb076 100644
--- a/mk/default.mk
+++ b/mk/default.mk
@@ -26,10 +26,6 @@ infodir = $(prefix)/info
 # the branch when undefined.
 GIT_BRANCH =
 
-# Define if you want to include some (or all) files from contrib/lisp
-# just the filename please (no path prefix, no .el suffix), maybe with globbing
-#ORG_ADD_CONTRIB = ox-* # e.g. the contributed exporter
-
 # Where to create temporary files for the testsuite
 # respect TMPDIR if it is already defined in the environment
 TMPDIR ?= /tmp
diff --git a/mk/server.mk b/mk/server.mk
deleted file mode 100644
index 48b3f26..000
--- a/mk/server.mk
+++ /dev/null
@@ -1,135 +0,0 @@
-#--
-# This file is used for maintenance of org on the server.
-#--
-.PHONY:helpserver \
-   release rel-dirty rel-up cleanrel \
-   elpa elpa-dirty elpa-up \
-   doc-up \
-   upload-release upload-elpa upload-doc upload \
-   tagwarn version
-
-help helpall helpserver::
-   $(info )
-   $(info Maintenance)
-   $(info ===)
-   $(info release - clean up, create the distribution archives)
-   $(info elpa- clean up, create the org-*.tar ELPA 
archive)
-   $(info elpaplus- clean up, create the 
org-plus-contrib-*.tar ELPA archive)
-   $(info upload-release  - clean up, populate the server with 
archives)
-   $(info upload-elpa - clean up, populate the server with 
org-*.tar)
-   $(info upload-elpaplus - clean up, populate the server with 
org-plus-contrib-*.tar)
-   $(info upload-doc  - clean up, populate the server with docs)
-   $(info upload  - clean up, populate the server with 
everything)
-
-helpserver::
-   @echo ""
-
-#--
-
-SERVROOT ?= upload
-SERVERMK ?= true # or just any value at all, really
-
-#--
-
-ORGFULL   = README COPYING lisp/ \
-   Makefile request-assign-future.txt \
-   mk/default.mk mk/targets.mk mk/version.mk \
-   mk/org-fixup.el \
-   etc/ contrib/ doc/ testing/
-ORGFULL  := $(ORGFULL:%/=%/*)
-ORGELPA   = README_ELPA COPYING etc/ORG-NEWS lisp/ \
-   doc/dir doc/org.info doc/orgguide.info doc/orgcard.pdf \
-   etc/styles/ org-pkg.el
-ORGELPA  := $(ORGELPA:%/=%/*)
-ORGELPAPLUS := $(ORGELPA:org-pkg%=org-plus-contrib-pkg%)
-
-release:   cleanall info pdf card rel-dirty tagwarn
-rel-dirty rel-up:  ORGDIR=org-$(GITVERSION:release_%=%)
-rel-dirty:
-   @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-dist version autoloads
-   -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGRZIP)
-   ln -s . $(ORGDIR)
-   tar -zcf $(ORGDIR).tar.gz $(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist))
-   zip -r9  $(ORGDIR).zip$(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist))
-   -@$(RM) $(ORGDIR)
-rel-up:info pdf card rel-dirty
-   $(CP) $(ORGDIR).tar.gz $(ORGDIR).zip $(SERVROOT)/
-
-PKG_TAG = $(shell date +%Y%m%d)
-PKG_DOC = "Outline-based notes management and organizer"
-PKG_REQ = "" # marmalade chokes on explicit "nil"
-
-elpa:  cleanall info card elpa-dirty
-elpa-dirty elpa-up:ORGDIR=org-$(PKG_TAG)
-elpa-dirty:
-   @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads
-   -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
-   ln -s . $(ORGDIR)
-   echo "(define-package \"org\""> org-pkg.el
-   echo "  \"$(PKG_TAG)\" \"$(PKG_DOC)\" ($(PKG_REQ)))" >> org-pkg.el
-   echo ";; Local Variables:"   >> org-pkg.el
-   echo ";; no-byte-compile: t" >> org-pkg.el
-   echo ";; End:"   >> org-pkg.el
-   tar --exclude=Makefile \
- --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
- $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
-   -@$(RM) $(ORGDIR) org-pkg.el
-elpa-up:   info card elpa-dirty archive-contents
-   $(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/elpa/
-
-archive-contents:
-   echo "(1 (org  . [($(PKG_TAG)) ($(PKG_REQ)) \"$(PKG_DOC)\" 
tar])"   > $@
-   echo "   (org-plus-contrib . [($(PKG_TAG)) ($(PKG_REQ)) \"$(PKG_DOC)\" 
tar]))" >> $@
-
-elpaplus:  cleanall info card elpaplus-dirty
-elpaplus-dirty elpaplus-up:ORG_ADD_CONTRIB=org*.el ob-*.el ox

[elpa] externals/tramp 692f57b: Tramp ELPA version 2.5.1.3 released

[ELPA Syncer]

branch: externals/tramp
commit 692f57b8c7d87eecf04e5f0ad062d9b14286eb96
Author: Michael Albinus 
Commit: Michael Albinus 

Tramp ELPA version 2.5.1.3 released
---
 test/tramp-tests.el | 25 +++--
 texi/tramp.texi | 26 +-
 texi/trampver.texi  |  2 +-
 tramp-cmds.el   |  2 ++
 tramp-gvfs.el   | 11 +++
 tramp-sh.el | 54 -
 tramp.el|  6 +++---
 trampver.el |  6 +++---
 8 files changed, 85 insertions(+), 47 deletions(-)

diff --git a/test/tramp-tests.el b/test/tramp-tests.el
index 4c452ed..28aadbb 100644
--- a/test/tramp-tests.el
+++ b/test/tramp-tests.el
@@ -52,6 +52,7 @@
 (require 'vc-git)
 (require 'vc-hg)
 
+(declare-function tramp-check-remote-uname "tramp-sh")
 (declare-function tramp-find-executable "tramp-sh")
 (declare-function tramp-get-remote-chmod-h "tramp-sh")
 (declare-function tramp-get-remote-gid "tramp-sh")
@@ -4587,7 +4588,9 @@ This tests also `make-symbolic-link', `file-truename' and 
`add-name-to-file'."
(while (accept-process-output proc 0 nil t
(should
 (string-match-p
- (if (memq process-connection-type '(nil pipe))
+ (if (and (memq process-connection-type '(nil pipe))
+   (not (tramp--test-macos-p)))
+  ;; On macOS, there is always newline conversion.
  ;; `telnet' converts \r to  if `crlf'
  ;; flag is FALSE.  See telnet(1) man page.
  "66\n6F\n6F\n0D\\(\n00\\)?\n0A\n"
@@ -4852,8 +4855,10 @@ If UNSTABLE is non-nil, the test is tagged as 
`:unstable'."
  (while (accept-process-output proc 0 nil t
  (should
   (string-match-p
-   (if (memq (or connection-type process-connection-type)
- '(nil pipe))
+   (if (and (memq (or connection-type process-connection-type)
+  '(nil pipe))
+ (not (tramp--test-macos-p)))
+;; On macOS, there is always newline conversion.
;; `telnet' converts \r to  if `crlf'
;; flag is FALSE.  See telnet(1) man page.
"66\n6F\n6F\n0D\\(\n00\\)?\n0A\n"
@@ -6062,7 +6067,7 @@ This requires restrictions of file name syntax."
'tramp-ftp-file-name-handler))
 
 (defun tramp--test-crypt-p ()
-  "Check, whether the remote directory is crypted"
+  "Check, whether the remote directory is crypted."
   (tramp-crypt-file-name-p tramp-test-temporary-file-directory))
 
 (defun tramp--test-docker-p ()
@@ -6099,8 +6104,7 @@ If optional METHOD is given, it is checked first."
 Several special characters do not work properly there."
   ;; We must refill the cache.  `file-truename' does it.
   (file-truename tramp-test-temporary-file-directory)
-  (string-match-p
-   "^HP-UX" (tramp-get-connection-property tramp-test-vec "uname" "")))
+  (tramp-check-remote-uname tramp-test-vec "^HP-UX"))
 
 (defun tramp--test-ksh-p ()
   "Check, whether the remote shell is ksh.
@@ -6111,6 +6115,12 @@ a $'' syntax."
   (string-match-p
"ksh$" (tramp-get-connection-property tramp-test-vec "remote-shell" "")))
 
+(defun tramp--test-macos-p ()
+  "Check, whether the remote host runs macOS."
+  ;; We must refill the cache.  `file-truename' does it.
+  (file-truename tramp-test-temporary-file-directory)
+  (tramp-check-remote-uname tramp-test-vec "Darwin"))
+
 (defun tramp--test-mock-p ()
   "Check, whether the mock method is used.
 This does not support external Emacs calls."
@@ -6788,6 +6798,8 @@ process sentinels.  They shall not disturb each other."
   (default-directory tmp-name)
   (file
(buffer-name
+;; Use `seq-random-elt' once <26.1 support
+;; is dropped.
 (nth (random (length buffers)) buffers)))
  ;; A remote operation in a timer could
  ;; confuse Tramp heavily.  So we ignore this
@@ -6853,6 +6865,7 @@ process sentinels.  They shall not disturb each other."
 ;; the buffers.  Mix with regular operation.
 (let ((buffers (copy-sequence buffers)))
   (while buffers
+;; Use `seq-random-elt' once <26.1 support is dropped.
 (let* ((buf (nth (random (length buffers)) buffers))
(proc (get-buffer-process buf))
(file (process-get proc 'foo))
diff --git a/texi/tramp.texi b/texi/tramp.texi
index e7b1995..4f786d9 100644
--- a/texi/tramp.texi
+++ b/texi/tramp.texi
@@ -2610,7 +2610,7 @@ where @samp{192.168.0.1} is the remote host IP address
 @node FUSE setup
 @section @acronym{FUSE} setup hint

[elpa] externals/org cb408a5 3/5: etc/ORG-NEWS: Remove a spurious phrase

[ELPA Syncer]

branch: externals/org
commit cb408a550a6b1b370e71d4bacea55b6b752cbf85
Author: Juan Manuel Macías 
Commit: Bastien 

etc/ORG-NEWS: Remove a spurious phrase
---
 etc/ORG-NEWS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 47bc088..17f8512 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -187,8 +187,7 @@ that Org mode configures LaTeX to process any new float 
type.
 The LaTeX export back-end accepts four attributes for verse blocks:
 =:lines=, =:center=, =:versewidth= and =:latexcode=. The three first
 require the external LaTeX package =verse.sty=, which is an extension
-of the standard LaTeX environment. The purpose of these attributes is
-explained below.
+of the standard LaTeX environment.
 
 The LaTeX export back-end accepts two attributes for quote blocks:
 =:environment=, for an arbitrary quoting environment (the default

[elpa] externals/org 33799db 2/5: doc/org-manual.org: End sentences with two spaces, fix indentation

[ELPA Syncer]

branch: externals/org
commit 33799db8c24d247fc61a8303f912c8f69ee9e14d
Author: Bastien 
Commit: Bastien 

doc/org-manual.org: End sentences with two spaces, fix indentation
---
 doc/org-manual.org | 59 +++---
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 5f0e81c..4366315 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -2915,9 +2915,10 @@ For more information and examples see the 
[[https://orgmode.org/worg/org-tutoria
 
 - ticks ::
 
-  Provides a desired number of axis ticks to display, that may be used by a 
plot
-  type. If none is given a plot type that requires ticks will use
-  ~org--plot/sensible-tick-num~ to try to determine a good value.
+  Provides a desired number of axis ticks to display, that may be used
+  by a plot type.  If none is given a plot type that requires ticks
+  will use ~org--plot/sensible-tick-num~ to try to determine a good
+  value.
 
 - =timefmt= ::
 
@@ -3160,14 +3161,14 @@ Here is the full set of built-in link types:
 
 - =file= ::
 
-   File links.  File name may be remote, absolute, or relative.
+  File links.  File name may be remote, absolute, or relative.
 
-   Additionally, you can specify a line number, or a text search.
-   In Org files, you may link to a headline name, a custom ID, or a
-   code reference instead.
+  Additionally, you can specify a line number, or a text search.
+  In Org files, you may link to a headline name, a custom ID, or a
+  code reference instead.
 
-   As a special case, "file" prefix may be omitted if the file name
-   is complete, e.g., it starts with =./=, or =/=.
+  As a special case, "file" prefix may be omitted if the file name
+  is complete, e.g., it starts with =./=, or =/=.
 
 - =attachment= ::
 
@@ -8268,7 +8269,7 @@ To make Org mode take care of versioning of attachments 
for you, add
 the following to your Emacs config:
 
 #+begin_src emacs-lisp
-  (require 'org-attach-git)
+(require 'org-attach-git)
 #+end_src
 
 *** Attach from Dired
@@ -11374,7 +11375,7 @@ The following command handles footnotes:
   #+attr_texinfo: :columns 0.1 0.9
   | {{{kbd(s)}}} | Sort the footnote definitions by reference sequence.
   |
   | {{{kbd(r)}}} | Renumber the simple =fn:N= footnotes.   
   |
-  | {{{kbd(S)}}} | Short for first {{{kbd(r)}}}, then {{{kbd(s)}}} action. 
   |
+  | {{{kbd(S)}}} | Short for first {{{kbd(r)}}}, then {{{kbd(s)}}} action. 
   |
   | {{{kbd(n)}}} | Rename all footnotes into a =fn:1= ... =fn:n= sequence. 
   |
   | {{{kbd(d)}}} | Delete the footnote at point, including definition and 
references. |
 
@@ -12031,7 +12032,7 @@ example
 #+texinfo: @noindent
 becomes
 
-: Rose is red, violet's blue. Life's ordered: Org assists you.
+: Rose is red, violet's blue.  Life's ordered: Org assists you.
 
 As a special case, Org parses any replacement text starting with
 =(eval= as an Emacs Lisp expression and evaluates it accordingly.
@@ -12766,8 +12767,8 @@ exports to:
 #+begin_src html
 
   
-
-  Your browser does not support the video tag.
+  
+  Your browser does not support the video tag.
 
 #+end_src
 
@@ -13883,11 +13884,11 @@ The LaTeX export back-end converts horizontal rules 
by the specified
 #+cindex: @samp{ATTR_LATEX}, keyword
 
 The LaTeX export back-end accepts four attributes for verse blocks:
-=:lines=, =:center=, =:versewidth= and =:latexcode=. The three first
+=:lines=, =:center=, =:versewidth= and =:latexcode=.  The three first
 require the external LaTeX package =verse.sty=, which is an extension
 of the standard LaTeX environment.
 
-- =:lines= :: To add marginal verse numbering. Its value is an
+- =:lines= :: To add marginal verse numbering.  Its value is an
   integer, the sequence in which the verses should be numbered.
 - =:center= :: With value =t= all the verses on the page are optically
   centered (a typographic convention for poetry), taking as a
@@ -13933,7 +13934,7 @@ To eat the world’s due, by the grave and thee.
 The LaTeX export back-end accepts two attributes for quote blocks:
 =:environment=, for an arbitrary quoting environment (the default
 value is that of ~org-latex-default-quote-environment~: ~"quote"~) and
-=:options=. For example, to choose the environment =quotation=,
+=:options=.  For example, to choose the environment =quotation=,
 included as an alternative to =quote= in standard LaTeX classes:
 
 #+begin_example
@@ -15321,7 +15322,7 @@ To specify the author of the quotation, use the 
=:author= attribute.
 ,#+BEGIN_QUOTE
 The Lady of the Lake, her arm clad in the purest shimmering samite,
 held aloft Excalibur from the bosom of the water, signifying by divine
-providence that I, Arthur, was to carry Excalibur. That is why I am
+providence that I, Arthur, was to carry Excalibur.  That is why I am
 your king.
 ,#+END_QUOTE
 #+end_example
@@ -17902,7 +17903,7 @@ Handling options aft

[elpa] externals-release/org e4c0281: Set the MIDI file extension conditionally

[ELPA Syncer]

branch: externals-release/org
commit e4c0281d23b6fdca33dda255eef412066779e34d
Author: Jonathan Gregory 
Commit: Bastien 

Set the MIDI file extension conditionally

* lisp/ob-lilypond.el (org-babel-lilypond-attempt-to-play-midi): By
default, LilyPond outputs .mid files for Windows and .midi for
everything else.

See: 

TINYCHANGE
---
 lisp/ob-lilypond.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index fbdd905..e0557eb 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -328,7 +328,9 @@ If TEST is non-nil, the shell command is returned and is 
not run."
 FILE-NAME is full path to lilypond file.
 If TEST is non-nil, the shell command is returned and is not run."
   (when org-babel-lilypond-play-midi-post-tangle
-(let ((midi-file (org-babel-lilypond-switch-extension file-name ".midi")))
+(let* ((ext (if (eq system-type 'windows-nt)
+".mid" ".midi"))
+   (midi-file (org-babel-lilypond-switch-extension file-name ext)))
   (if (file-exists-p midi-file)
   (let ((cmd-string
  (concat org-babel-lilypond-midi-command " " midi-file)))

[elpa] externals/org 31929f5 4/5: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 31929f539c25d2511fdcd1ba689ab2b5aa4af268
Merge: cb408a5 e4c0281
Author: Bastien 
Commit: Bastien 

Merge branch 'bugfix'
---
 lisp/ob-lilypond.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index 37d1f8a..410d53b 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -337,7 +337,9 @@ If TEST is non-nil, the shell command is returned and is 
not run."
 FILE-NAME is full path to lilypond file.
 If TEST is non-nil, the shell command is returned and is not run."
   (when org-babel-lilypond-play-midi-post-tangle
-(let ((midi-file (org-babel-lilypond-switch-extension file-name ".midi")))
+(let* ((ext (if (eq system-type 'windows-nt)
+".mid" ".midi"))
+   (midi-file (org-babel-lilypond-switch-extension file-name ext)))
   (if (file-exists-p midi-file)
   (let ((cmd-string
  (concat org-babel-lilypond-midi-command " " midi-file)))

[elpa] externals/org 6dcddb1 1/5: doc/org-manual.org: Fix Shakespeare's sonnet

[ELPA Syncer]

branch: externals/org
commit 6dcddb1b6fcbfdeca751000865b3abaf5b5c118e
Author: Juan Manuel Macías 
Commit: Bastien 

doc/org-manual.org: Fix Shakespeare's sonnet

* doc/org-manual.org (Verse blocks in LaTeX export): The previous
version of Shakespeare's sonnet is replaced by the version included in
Wikipedia (Shakespeare, William. Duncan-Jones, Katherine. Shakespeare’s
Sonnets. Bloomsbury Arden 2010. p. 113).
* etc/ORG-NEWS (Support verse blocks in LaTeX export): The last
sentence is superfluous.  There is no explanation below.
---
 doc/org-manual.org | 49 +
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 2002a05..5f0e81c 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -640,10 +640,10 @@ The following commands jump to other headlines in the 
buffer.
   where you can use the following keys to find your destination:
 
   #+attr_texinfo: :columns 0.3 0.7
-  | {{{kbd(TAB)}}}  | Cycle visibility.   |
+  | {{{kbd(TAB)}}}| Cycle visibility.   |
   | {{{kbd(DOWN)}}} / {{{kbd(UP)}}} | Next/previous visible headline. |
-  | {{{kbd(RET)}}}  | Select this location.   |
-  | {{{kbd(/)}}}| Do a Sparse-tree search |
+  | {{{kbd(RET)}}}| Select this location.   |
+  | {{{kbd(/)}}}  | Do a Sparse-tree search |
 
   #+texinfo: @noindent
   The following keys work if you turn off ~org-goto-auto-isearch~
@@ -651,9 +651,9 @@ The following commands jump to other headlines in the 
buffer.
   #+attr_texinfo: :columns 0.3 0.7
   | {{{kbd(n)}}} / {{{kbd(p)}}}   | Next/previous visible headline.|
   | {{{kbd(f)}}} / {{{kbd(b)}}}   | Next/previous headline same level. |
-  | {{{kbd(u)}}}  | One level up.  |
+  | {{{kbd(u)}}}| One level up.  |
   | {{{kbd(0)}}} ... {{{kbd(9)}}} | Digit argument.|
-  | {{{kbd(q)}}}  | Quit.  |
+  | {{{kbd(q)}}}| Quit.  |
 
   #+vindex: org-goto-interface
   #+texinfo: @noindent
@@ -2178,7 +2178,7 @@ trailing white space and surrounded in double-quotes.  
For example:
 concatenates the content of columns 1 and column 2.
 
 When the =N= flag is used, all referenced elements are parsed as
-numbers and interpolated as Lisp numbers, without quotes. Fields that
+numbers and interpolated as Lisp numbers, without quotes.  Fields that
 cannot be parsed as numbers are interpolated as zeros.  For example:
 
 : '(+ $1 $2);N
@@ -2186,7 +2186,7 @@ cannot be parsed as numbers are interpolated as zeros.  
For example:
 #+texinfo: @noindent
 adds columns 1 and 2, equivalent to Calc's =$1+$2=.  Ranges are
 inserted as space-separated fields, so they can be embedded in list or
-vector syntax. For example:
+vector syntax.  For example:
 
 : '(apply '+ '($1..$4));N
 
@@ -2866,8 +2866,8 @@ For more information and examples see the 
[[https://orgmode.org/worg/org-tutoria
 
 - transpose ::
 
-  When =y=, =yes=, or =t= attempt to transpose the table data before plotting. 
Also
-  recognises the shorthand option =trans=.
+  When =y=, =yes=, or =t= attempt to transpose the table data before
+  plotting.  Also recognises the shorthand option =trans=.
 
 - =type= ::
 
@@ -2901,15 +2901,17 @@ For more information and examples see the 
[[https://orgmode.org/worg/org-tutoria
 
 - min ::
 
-  Provides a minimum axis value that may be used by a plot type. Implicitly
-  assumes the =y= axis is being referred to. Can explicitly provide a value 
for a
-  either the =x= or =y= axis with =xmin= and =ymin=.
+  Provides a minimum axis value that may be used by a plot type.
+  Implicitly assumes the =y= axis is being referred to.  Can
+  explicitly provide a value for a either the =x= or =y= axis with
+  =xmin= and =ymin=.
 
 - max ::
 
-  Provides a maximum axis value that may be used by a plot type. Implicitly
-  assumes the =y= axis is being referred to. Can explicitly provide a value 
for a
-  either the =x= or =y= axis with =xmax= and =ymax=.
+  Provides a maximum axis value that may be used by a plot type.
+  Implicitly assumes the =y= axis is being referred to.  Can
+  explicitly provide a value for a either the =x= or =y= axis with
+  =xmax= and =ymax=.
 
 - ticks ::
 
@@ -13883,8 +13885,7 @@ The LaTeX export back-end converts horizontal rules by 
the specified
 The LaTeX export back-end accepts four attributes for verse blocks:
 =:lines=, =:center=, =:versewidth= and =:latexcode=. The three first
 require the external LaTeX package =verse.sty=, which is an extension
-of the standard LaTeX environment. The purpose of these attributes is
-explained below.
+of the standard LaTeX environment.
 
 - =:lines= :: To add marginal verse numbering. Its value is an
   integer, the 

[elpa] externals/org updated (8db21e6 -> 32b9251)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  8db21e6   Remove and update Makefiles as contrib/ has been moved out
   new  6dcddb1   doc/org-manual.org: Fix Shakespeare's sonnet
   new  33799db   doc/org-manual.org: End sentences with two spaces, fix 
indentation
   new  cb408a5   etc/ORG-NEWS: Remove a spurious phrase
  adds  14fb761   Do not use mark-whole-buffer noninteractively
   new  e4c0281   Set the MIDI file extension conditionally
   new  31929f5   Merge branch 'bugfix'
   new  32b9251   Parse titleless headlines with a tag correctly


Summary of changes:
 doc/org-manual.org  | 108 ++--
 etc/ORG-NEWS|   3 +-
 lisp/ob-lilypond.el |   4 +-
 lisp/org-element.el |   5 ++-
 4 files changed, 63 insertions(+), 57 deletions(-)

[elpa] externals/org 32b9251 5/5: Parse titleless headlines with a tag correctly

[ELPA Syncer]

branch: externals/org
commit 32b92518861291d57d6222e321bce7dee1430730
Author: Ihor Radchenko 
Commit: Bastien 

Parse titleless headlines with a tag correctly

* lisp/org-element.el (org-element-headline-parser): Do not treat tag
as headline title in headlines like "* :tag:".
---
 lisp/org-element.el | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index 2dfbaea..1c971b2 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -1021,7 +1021,10 @@ Assume point is at beginning of the headline."
   (commentedp
(and (let (case-fold-search) (looking-at org-comment-string))
 (goto-char (match-end 0
-  (title-start (point))
+  (title-start (prog1 (point)
+  (unless (or todo priority commentedp)
+;; Headline like "* :tag:"
+(skip-syntax-backward " \t"
   (tags (when (re-search-forward
"[ \t]+\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$"
(line-end-position)

[elpa] main 530dc36: * elpa-paclages (nano-theme): New package

[monnier--- via]

branch: main
commit 530dc36b9331f49a5ad1c8a91d462f7369100f7f
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-paclages (nano-theme): New package
---
 elpa-packages | 5 +
 1 file changed, 5 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 5166d6e..ed0db60 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -260,6 +260,8 @@
  ("nadvice":url nil)
  ("nameless"   :url "https://github.com/Malabarba/Nameless";)
  ("names"  :url "https://github.com/Malabarba/names";)
+ ("nano-theme" :url "https://github.com/rougier/nano-theme";
+  :auto-sync t)
  ("nhexl-mode" :url nil)
  ("nlinum" :url nil)
  ("notes-mode" :url nil)
@@ -291,6 +293,9 @@
  ("path-iterator"  :url nil)
  ("peg":url) ;Was in "https://github.com/ellerh/peg.el";
  ("persist" :url "https://gitlab.com/phillord/persist.git";)
+ ;; FIXME: Waiting for copyright paperwork.
+ ;; ("phpinspect"  :url "https://git.sr.ht/~hugot/phpinspect.el";
+ ;;  :auto-sync t)
  ("phps-mode"  :url "https://github.com/cjohansson/emacs-phps-mode";)
  ("pinentry"   :url "https://github.com/ueno/pinentry-el.git";)
  ("poker"  :url nil)

[nongnu] main f43f7a0: * elpa-packages (vc-fossil): New package

[monnier--- via]

branch: main
commit f43f7a0b31e2d58cb362d5b291e8cda6df7d28d2
Author: Alfred M. Szmidt 
Commit: Stefan Monnier 

* elpa-packages (vc-fossil): New package
---
 elpa-packages | 5 +
 1 file changed, 5 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 1074f4c..dfbe5c4 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -228,6 +228,9 @@
   ;; https://github.com/Fuco1/smartparens/releases/tag/1.11.0
   :version-map ((nil "1.11.0" "4873352b5d0a1c5142658122de1b6950b8fe7e4d")))
 
+ ;; ("subed"   :url "https://github.com/rndusr/subed";
+ ;;  :lisp-dir "subed")
+
  ("swift-mode" :url "https://github.com/swift-emacs/swift-mode";
   :ignored-files ("scripts" "test" "Eldev" "Makefile"))
 
@@ -236,6 +239,8 @@
 
  ("tuareg" :url "https://github.com/ocaml/tuareg.git";)
 
+ ("vc-fossil"  :url "https://github.com/venks1/emacs-fossil";)
+
  ("web-mode"   :url "https://github.com/fxbois/web-mode";
   :ignored-files ("issues" "tests" "run.sh"))
 

[elpa] externals/consult d230fda: Fix misleading docstring (Fix #425)

[ELPA Syncer]

branch: externals/consult
commit d230fdaae58d613c9ab2fd26af08669f51cb2e62
Author: Daniel Mendler 
Commit: Daniel Mendler 

Fix misleading docstring (Fix #425)
---
 consult.el | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/consult.el b/consult.el
index 4ddff31..e5d3edc 100644
--- a/consult.el
+++ b/consult.el
@@ -145,12 +145,8 @@ nil shows all `custom-available-themes'."
 (defcustom consult-after-jump-hook '(recenter)
   "Function called after jumping to a location.
 
-Commonly used functions for this hook are `recenter' and
-`reposition-window'.
-
-This is called during preview and for the jump after selection.
-You may want to add a function which pulses the current line, e.g.,
-`xref-pulse-momentarily'."
+Commonly used functions for this hook are `recenter' and `reposition-window'.
+This is called during preview and for the jump after selection."
   :type 'hook)
 
 (defcustom consult-line-start-from-top nil

[elpa] branch externals/nano-theme created (now 1ad2168)

[ELPA Syncer]

elpasync pushed a change to branch externals/nano-theme.

at  1ad2168   Cosmetic changes in comments

This branch includes the following new commits:

   new  28cb699   Initial import
   new  6735537   Bug fix
   new  64ae70b   Minor precision
   new  d5affda   Recommended layout is off
   new  c615b55   Added a nano-mode function to apply recommended settings
   new  9b4a669   Added installation instructions
   new  6127576   Add autoload for Custom
   new  2628d5b   Merge pull request #1 from kisaragi-hiu/patch-1
   new  73c3be1   Added header line customization
   new  374962f   Merge remote-tracking branch 'origin/master'
   new  f41c941   Typo
   new  eb8b98a   Add file header
   new  3285578   Add Quelpa installation instructions
   new  3dd71e1   Merge pull request #2 from mpereira/patch-1
   new  8d3ae3a   Experiments to remove inheritance that slow down redisplay
   new  ae5d982   Merge remote-tracking branch 'origin/master'
   new  99ff1c5   Removed automatic start
   new  8c50bda   Make fonts stack an option (default is disabled)
   new  4a23178   Fix theme for new frames. Close #6
   new  5d4f6c6   Added GNUS faces and suppressed warnings
   new  a9e0ddd   Added documentation
   new  2c252fe   Minor correction in documentation
   new  da11e53   Removed tabs
   new  1ad2168   Cosmetic changes in comments

[elpa] externals/nano-theme 3285578 13/24: Add Quelpa installation instructions

[ELPA Syncer]

branch: externals/nano-theme
commit 328557891eac318cbf90bc3a9cce6cbdcdc97fad
Author: Murilo Pereira 
Commit: Murilo Pereira 

Add Quelpa installation instructions
---
 README.md | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 16b4660..5dd4a3f 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,17 @@ Install with 
[straight.el](https://github.com/raxod502/straight.el):
:repo "rougier/nano-theme"))
 ```
 
+... or install with [`quelpa`](https://github.com/quelpa/quelpa):
+
+```emacs-lisp
+(use-package nano-theme
+  :ensure nil
+  :defer t
+  :quelpa (nano-theme
+   :fetcher github
+   :repo "rougier/nano-theme"))
+```
+
 ### Usage
 
 Load theme directly: `M-x: (load-theme 'nano t)`  

[elpa] externals/nano-theme 64ae70b 03/24: Minor precision

[ELPA Syncer]

branch: externals/nano-theme
commit 64ae70b09075a6bc20350100af050d492e32a901
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Minor precision
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e267f0d..6637c3a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ A consistent theme for GNU Emacs. The light theme is based on 
[Material
 colors](https://material.io/) and the dark theme is based on [Nord
 colors](https://www.nordtheme.com/).
 
-The theme is based on a set of six faces:
+The theme is based on a set of six faces (only):
 
 - **Critical face** is for information that requires immediate action.
 

[elpa] externals/nano-theme f41c941 11/24: Typo

[ELPA Syncer]

branch: externals/nano-theme
commit f41c941d1fcc62650df12f68d3db75c953f907f4
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Typo
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index efb5d67..16b4660 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Install with 
[straight.el](https://github.com/raxod502/straight.el):
 
 ```
 (straight-use-package '(nano-theme :type git :host github
-   :repo "rougier/nano-theme")
+   :repo "rougier/nano-theme"))
 ```
 
 ### Usage

[elpa] externals/nano-theme 9b4a669 06/24: Added installation instructions

[ELPA Syncer]

branch: externals/nano-theme
commit 9b4a669c8436480b3e06802f31e0781efb3d7e80
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Added installation instructions
---
 README.md | 21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6637c3a..efb5d67 100644
--- a/README.md
+++ b/README.md
@@ -44,10 +44,27 @@ The theme is based on a set of six faces (only):
   > information and this can be made by setting a very light
   > background color that is barely perceptible.
 
+
+### Installation
+
+Install with [straight.el](https://github.com/raxod502/straight.el):
+
+```
+(straight-use-package '(nano-theme :type git :host github
+   :repo "rougier/nano-theme")
+```
+
 ### Usage
 
-You can save the file in you `.emacs.d` directory and then type `M-x:
-(load-theme 'nano)` or `M-x: (nano-light)` or `M-x: (nano-dark)`
+Load theme directly: `M-x: (load-theme 'nano t)`  
+
+Alternatively, you can type:
+- `M-x: (nano-light)` for light theme
+- `M-x: (nano-dark)` for dark theme
+
+If you want the same aspect as in the screenshots, you can also use
+`M-x: (nano-setup)` 
+
 
 ### Screenshots
 

[elpa] externals/nano-theme 6735537 02/24: Bug fix

[ELPA Syncer]

branch: externals/nano-theme
commit 673553792fb143dc262e98918847f531137cc20c
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Bug fix
---
 nano-theme.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nano-theme.el b/nano-theme.el
index dc71447..98adf6f 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -678,7 +678,7 @@ background color that is barely perceptible."
'(mu4e-footer-face((t (:inherit nano-faded
'(mu4e-forwarded-face   ((t (:inherit nano-default
'(mu4e-header-face  ((t (:inherit nano-default
-   '(mu4e-header-highlight-face((t (:inherit  hl-line
+   '(mu4e-header-highlight-face((t (:inherit highlight
'(mu4e-header-key-face   ((t (:inherit nano-strong
'(mu4e-header-marks-face  ((t (:inherit nano-faded
'(mu4e-header-title-face ((t (:inherit nano-strong

[elpa] externals/nano-theme eb8b98a 12/24: Add file header

[ELPA Syncer]

branch: externals/nano-theme
commit eb8b98adc98a868ffd760351e08570314713f4cc
Author: Murilo Pereira 
Commit: GitHub 

Add file header

This allows the package to be installed with Quelpa:

```emacs-lisp
(use-package nano-theme
  :ensure nil
  :defer t
  :quelpa (nano-theme
   :fetcher github
   :repo "rougier/nano-theme"))
```

Without it the following error message is shown:

```
Error getting PACKAGE-DESC: (error Package lacks a file header)
quelpa-package-install: Wrong type argument: package-desc, nil
```
---
 nano-theme.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nano-theme.el b/nano-theme.el
index c1733bb..c619f2b 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -1,3 +1,5 @@
+;;; nano-theme.el --- A consistent theme for GNU Emacs  -*- coding: utf-8 -*-
+
 ;; -
 ;; GNU Emacs / N Λ N O theme
 ;; Copyright (C) 2021 - Nicolas P. Rougier

[elpa] externals/nano-theme 374962f 10/24: Merge remote-tracking branch 'origin/master'

[ELPA Syncer]

branch: externals/nano-theme
commit 374962f67c1e9eed8605fdf1fa20126401855886
Merge: 73c3be1 2628d5b
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Merge remote-tracking branch 'origin/master'
---
 nano-theme.el | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index 88a6193..c1733bb 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -810,6 +810,9 @@ background color that is barely perceptible."
  :background "#FFF9C4" ;; material color 
yellow L100
 ))
 
-(provide-theme 'nano)
+;;;###autoload
+(when (and (boundp 'custom-theme-load-path) load-file-name)
+  (add-to-list 'custom-theme-load-path
+   (file-name-as-directory (file-name-directory load-file-name
 
- 
+(provide-theme 'nano)

[elpa] externals/nano-theme 6127576 07/24: Add autoload for Custom

[ELPA Syncer]

branch: externals/nano-theme
commit 6127576a3a216b10d354bbe17c0b2bca83db849c
Author: Kisaragi Hiu 
Commit: GitHub 

Add autoload for Custom

Without this, load-theme would only be able to locate the theme if the
file happens to be located under custom-theme-load-path.
---
 nano-theme.el | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index f95caa5..a2621e7 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -801,6 +801,9 @@ background color that is barely perceptible."
  :background "#FFF9C4" ;; material color 
yellow L100
 ))
 
-(provide-theme 'nano)
+;;;###autoload
+(when (and (boundp 'custom-theme-load-path) load-file-name)
+  (add-to-list 'custom-theme-load-path
+   (file-name-as-directory (file-name-directory load-file-name
 
- 
+(provide-theme 'nano)

[elpa] externals/nano-theme 2628d5b 08/24: Merge pull request #1 from kisaragi-hiu/patch-1

[ELPA Syncer]

branch: externals/nano-theme
commit 2628d5b4f0afee5afb2e52cd35d860701bb16ac7
Merge: 9b4a669 6127576
Author: Nicolas P. Rougier 
Commit: GitHub 

Merge pull request #1 from kisaragi-hiu/patch-1

Add autoload for Custom
---
 nano-theme.el | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index f95caa5..a2621e7 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -801,6 +801,9 @@ background color that is barely perceptible."
  :background "#FFF9C4" ;; material color 
yellow L100
 ))
 
-(provide-theme 'nano)
+;;;###autoload
+(when (and (boundp 'custom-theme-load-path) load-file-name)
+  (add-to-list 'custom-theme-load-path
+   (file-name-as-directory (file-name-directory load-file-name
 
- 
+(provide-theme 'nano)

[elpa] externals/nano-theme da11e53 23/24: Removed tabs

[ELPA Syncer]

branch: externals/nano-theme
commit da11e539199d943fe0f936694d5c8c53624368be
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Removed tabs
---
 nano-theme.el | 112 +-
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index d400c83..f7d8b41 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -119,29 +119,29 @@
 
 (defface nano-mono
   '((t (:family "Roboto Mono"
-   :height 140
-   :weight light)))
+:height 140
+:weight light)))
   "Default monospaced font (Roboto Mono Light, 14pt)."
   :group 'nano-fonts)
 
 (defface nano-mono-alt
   '((t (:family "Fira Code"
-   :height 140
-   :weight light)))
+:height 140
+:weight light)))
   "Alternative monospaced font (Fira Code Light, 14pt)."
   :group 'nano-fonts)
 
 (defface nano-sans
   '((t (:family "Roboto"
-   :height 140
-   :weight light)))
+:height 140
+:weight light)))
   "Default proportional sans font (Roboto Light, 14pt)."
   :group 'nano-fonts)
 
 (defface nano-serif
   '((t (:family "Roboto Slab"
-   :height 140
-   :weight light)))
+:height 140
+:weight light)))
   "Default proportional serif font (Roboto Slab Light, 14pt)."
   :group 'nano-fonts)
 
@@ -360,8 +360,8 @@ background color that is barely perceptible."
   ;; Default frame settings
   (setq default-frame-alist
 (append (list
-'(min-height . 1)  '(height . 45)
-'(min-width  . 1)  '(width  . 81)
+ '(min-height . 1)  '(height . 45)
+ '(min-width  . 1)  '(width  . 81)
  '(vertical-scroll-bars . nil)
  '(internal-border-width . 24)
  '(left-fringe . 0)
@@ -379,9 +379,9 @@ background color that is barely perceptible."
 
   ;; Nicer glyphs for continuation and wrap 
   (set-display-table-slot standard-display-table
- 'truncation (make-glyph-code ?… 
'nano-faded))
+  'truncation (make-glyph-code ?… 'nano-faded))
   (set-display-table-slot standard-display-table
- 'wrap (make-glyph-code ?- 'nano-faded))
+  'wrap (make-glyph-code ?- 'nano-faded))
 
   ;; Nerd font for glyph icons
   (let ((roboto-nerd (font-spec :name "RobotoMono Nerd Font Mono")))
@@ -453,17 +453,17 @@ background color that is barely perceptible."
 ;;   "Extract face properties as a property list"
   
 ;;   (let ((tags (list :family :foundry :width :height :weight :slant 
:underline
-;; :overline :strike-through :box :inverse-video :foreground
-;; :background :stipple :extend :inherit))
-;; (properties))
+;; :overline :strike-through :box :inverse-video 
:foreground
+;; :background :stipple :extend :inherit))
+;;  (properties))
 ;; (if inherit
-;; `(:inherit ,face)
+;;  `(:inherit ,face)
 ;;   (progn
-;; (dolist (tag tags)
-;;   (let ((attribute (face-attribute face tag)))
-;; (when (not (eq attribute 'unspecified))
-;;   (push attribute properties)
-;;   (push tag properties)
+;;  (dolist (tag tags)
+;;(let ((attribute (face-attribute face tag)))
+;; (when (not (eq attribute 'unspecified))
+;;   (push attribute properties)
+;;   (push tag properties)
 ;;   properties)))
 
 
@@ -480,17 +480,17 @@ background color that is barely perceptible."
'nano
`(default ((,light (:foreground ,nano-light-foreground
:weight ,(face-attribute 'nano-mono :weight)
-  :height ,(face-attribute 'nano-mono 
:height)
+   :height ,(face-attribute 'nano-mono :height)
:family ,(face-attribute 'nano-mono :family)))
   (,dark  (:foreground ,nano-dark-foreground
:weight ,(face-attribute 'nano-mono :weight)
-  :height ,(face-attribute 'nano-mono 
:height)
+   :height ,(face-attribute 'nano-mono :height)
:family ,(face-attribute 'nano-mono :family)
`(nano-strong ((,light (:weight normal))
- (,dark  (:weight normal
+  (,dark  (:weight normal
`(variable-pitch  ((t (:weight ,(face-attribute 'nano-sans :weight)
- :height ,(face-attribute 
'nano-sans :height)
- :family ,(face-attribute 
'nano-sans :family)))
+  :height ,(face-attribute 'nano-sans :height)
+  :family ,(face-attribute 'nano-sans 
:family)))
 
 ;; Enforce nano fonts
   (if (not nano-fonts-use)
@@ -499,7

[elpa] externals-release/org 80b2aa4 3/9: Fix 1d5e41d41

[ELPA Syncer]

branch: externals-release/org
commit 80b2aa41e1054e9808d64ca8c4a412dc4c2d9ea4
Author: Bastien 
Commit: Bastien 

Fix 1d5e41d41
---
 lisp/ob-core.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 4b7de5f..06a2a88 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -691,6 +691,9 @@ a list with the following pattern:
 (`(:file-desc) result)
 (`(:file-desc . ,(and (pred stringp) val)) val)))
 
+(defvar *this*) ; Dynamically bound in `org-babel-execute-src-block'
+; and `org-babel-read'
+
 ;;;###autoload
 (defun org-babel-execute-src-block (&optional arg info params)
   "Execute the current source code block.

[elpa] externals/nano-theme 3dd71e1 14/24: Merge pull request #2 from mpereira/patch-1

[ELPA Syncer]

branch: externals/nano-theme
commit 3dd71e1f6d45eef582d72f3c823ce76f37b1edb8
Merge: f41c941 3285578
Author: Nicolas P. Rougier 
Commit: GitHub 

Merge pull request #2 from mpereira/patch-1

Add file header
---
 README.md | 11 +++
 nano-theme.el |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/README.md b/README.md
index 16b4660..5dd4a3f 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,17 @@ Install with 
[straight.el](https://github.com/raxod502/straight.el):
:repo "rougier/nano-theme"))
 ```
 
+... or install with [`quelpa`](https://github.com/quelpa/quelpa):
+
+```emacs-lisp
+(use-package nano-theme
+  :ensure nil
+  :defer t
+  :quelpa (nano-theme
+   :fetcher github
+   :repo "rougier/nano-theme"))
+```
+
 ### Usage
 
 Load theme directly: `M-x: (load-theme 'nano t)`  
diff --git a/nano-theme.el b/nano-theme.el
index c1733bb..c619f2b 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -1,3 +1,5 @@
+;;; nano-theme.el --- A consistent theme for GNU Emacs  -*- coding: utf-8 -*-
+
 ;; -
 ;; GNU Emacs / N Λ N O theme
 ;; Copyright (C) 2021 - Nicolas P. Rougier

[elpa] externals/nano-theme 8d3ae3a 15/24: Experiments to remove inheritance that slow down redisplay

[ELPA Syncer]

branch: externals/nano-theme
commit 8d3ae3a930411fc9078e34a3b89a263778824d7a
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Experiments to remove inheritance that slow down redisplay
---
 nano-theme.el | 78 ++-
 1 file changed, 51 insertions(+), 27 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index c1733bb..58d6a71 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -117,7 +117,7 @@
   "Salient color is used for information that are important."
   :type 'color :group 'nano-dark)
 
-(defcustom nano-dark-strong "#ECEFF4" ;; Snow Storm 3  / nord  6 
+(defcustom nano-dark-strong "#FF" ;; White
   "Strong color is used for information of a structural nature."
   :type 'color :group 'nano-dark)
 
@@ -213,9 +213,10 @@ background color that is barely perceptible."
   (setq window-divider-default-right-width 24)
   (setq window-divider-default-places 'right-only)
   (window-divider-mode 1)
-  (set-display-table-slot standard-display-table 'truncation ?…)
-  (set-display-table-slot standard-display-table 'wrap ?—))
-
+  (set-display-table-slot standard-display-table
+ 'truncation (make-glyph-code ?… 'nano-faded))
+  (set-display-table-slot standard-display-table
+ 'wrap (make-glyph-code ?… 'nano-faded)))
   
 (defun nano-light ()
   "Nano theme light"
@@ -259,6 +260,30 @@ background color that is barely perceptible."
   (set-background-color nano-dark-background))
 
 
+(defun inherit (face &optional inherit)
+  "Extract face properties as a property list"
+  
+  (let ((tags (list :family :foundry :width :height :weight :slant :underline
+   :overline :strike-through :box :inverse-video :foreground
+   :background :stipple :extend :inherit))
+   (properties))
+(if inherit
+   `(:inherit ,face)
+  (progn
+   (dolist (tag tags)
+ (let ((attribute (face-attribute face tag)))
+   (when (not (eq attribute 'unspecified))
+ (push attribute properties)
+ (push tag properties)
+  properties)))
+
+;; (custom-theme-set-faces 'nano
+;;   '(bold ((t (:inherit nano-strong)
+;;   
+;; (custom-theme-set-faces 'nano
+;;   `(bold ((t ,(inherit 'nano-strong)
+
+
 ;; ---  Theme --
 (let ((light '((background light)))
   (dark  '((background dark)))
@@ -267,7 +292,7 @@ background color that is barely perceptible."
 
   (custom-theme-set-faces
'nano
-
+   
;; --- Base -
`(default ((,light (:foreground ,nano-light-foreground
   :weight ,(face-attribute 'nano-mono :weight)
@@ -348,7 +373,7 @@ background color that is barely perceptible."
   (,dark  (:foreground ,nano-dark-critical
:background ,nano-dark-background

-   ;; --- Header & mode line ---
+   ;; --- Header & mode line ---

`(mode-line ((,light (:foreground ,nano-light-background
  :background ,nano-light-foreground
@@ -384,7 +409,8 @@ background color that is barely perceptible."
:inherit nil
:box nil
 
-   ;; --- Structural -
+   
+   ;; --- Structural ---
'(bold((t (:inherit nano-strong
'(italic  ((t (:slant italic
'(bold-italic ((t (:inherit nano-strong
@@ -398,14 +424,14 @@ background color that is barely perceptible."
  :height ,(face-attribute 'nano-sans 
:height)
  :family ,(face-attribute 'nano-sans 
:family)

-   ;; --- Semantic -
+   ;; --- Semantic -
'(shadow((t (:inherit nano-faded
'(success   ((t (:inherit nano-salient
'(warning   ((t (:inherit nano-popout
'(error ((t (:inherit nano-critical
'(match ((t (:inherit nano-popout
 
-   ;; --- General -
+   ;; --- General --
'(buffer-menu-buffer((t (:inherit nano-strong
'(minibuffer-prompt ((t (:inherit nano-strong
'(isearch   ((t (:inherit nano-strong
@@ -445,13 +471,13 @@ background color that is barely perceptible."
'(tab-bar-tab-inactive  ((t (:inherit nano-faded

[elpa] externals/nano-theme 8c50bda 18/24: Make fonts stack an option (default is disabled)

[ELPA Syncer]

branch: externals/nano-theme
commit 8c50bdaf7a7ebf62d44ffa4ec10a3057b027262c
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Make fonts stack an option (default is disabled)
---
 nano-theme.el | 252 +++---
 1 file changed, 189 insertions(+), 63 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index 0344066..944f691 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -16,12 +16,13 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see .
 ;; -
+(require 'disp-table)
 
 (deftheme nano
-  "NΛNO Theme")
+  "N Λ N O Theme")
 
 (defgroup nano nil
-  "NΛNO")
+  "N Λ N O")
 
 (defgroup nano-light nil
   "Light theme color palette" :group 'nano)
@@ -32,6 +33,9 @@
 (defgroup nano-fonts nil
   "Dark & Light theme fonts" :group 'nano)
 
+(defcustom nano-fonts-use nil
+  "Whether to use font stack"
+  :type 'boolean :group 'nano-fonts)
 
 (defface nano-mono
   '((t (:family "Roboto Mono"
@@ -47,7 +51,6 @@
   "Alternative monospaced font (Fira Code Light, 14pt)."
   :group 'nano-fonts)
 
-
 (defface nano-sans
   '((t (:family "Roboto"
:height 140
@@ -203,31 +206,108 @@ background color that is barely perceptible."
   "Default face inversed." :group nil)
 
 (defun nano-setup ()
-  "Nano recommend settings (optional)"
+  "Defaults settings for nano (optional)"
 
-  (interactive)
-  (set-frame-parameter nil 'internal-border-width 24)
-  (set-frame-parameter nil 'width 81)
-  (set-frame-parameter nil 'height 45)
-  (set-frame-parameter nil 'left-fringe 0)
-  (set-frame-parameter nil 'right-fringe 0)
-  (if (fboundp 'tool-bar-mode) (tool-bar-mode nil))
-  (tooltip-mode 0)
-  (scroll-bar-mode 0)
-  (menu-bar-mode 0)
+  ;; Use nano fonts
+  (setq nano-fonts-use t)
+  
+  ;; No startup  screen
+  (setq inhibit-startup-screen t)
+
+  ;; No startup message
+  (setq inhibit-startup-message t)
+  (setq inhibit-startup-echo-area-message t)
+
+  ;; No message in scratch buffer
+  (setq initial-scratch-message nil)
+
+  ;; Initial buffer
+  (setq initial-buffer-choice nil)
+
+  ;; No frame title
+  (setq frame-title-format nil)
+
+  ;; No file dialog
+  (setq use-file-dialog nil)
+
+  ;; No dialog box
+  (setq use-dialog-box nil)
+
+  ;; No popup windows
+  (setq pop-up-windows nil)
+
+  ;; No empty line indicators
+  (setq indicate-empty-lines nil)
+
+  ;; No cursor in inactive windows
+  (setq cursor-in-non-selected-windows nil)
+
+  ;; Text mode is initial mode
+  (setq initial-major-mode 'text-mode)
+
+  ;; Text mode is default major mode
+  (setq default-major-mode 'text-mode)
+
+  ;; Moderate font lock
+  (setq font-lock-maximum-decoration nil)
+
+  ;; No limit on font lock
+  (setq font-lock-maximum-size nil)
+
+  ;; No line break space points
+  (setq auto-fill-mode nil)
+
+  ;; Fill column at 80
+  (setq fill-column 80)
+
+  ;; Bar cursor
+  (setq-default cursor-type '(hbar .  2))
+  (setq-default cursor-in-non-selected-windows nil)
+  (setq blink-cursor-mode nil)
+
+  ;; No scroll bars
+  (if (fboundp 'scroll-bar-mode)
+  (scroll-bar-mode -1))
+
+  ;; No toolbar
+  (if (fboundp 'tool-bar-mode)
+  (tool-bar-mode nil))
+
+  ;; Default frame settings
+  (setq default-frame-alist
+(append (list
+'(min-height . 1)  '(height . 45)
+'(min-width  . 1)  '(width  . 81)
+ '(vertical-scroll-bars . nil)
+ '(internal-border-width . 24)
+ '(left-fringe . 0)
+ '(right-fringe . 0)
+ '(tool-bar-lines . 0)
+ '(menu-bar-lines . 0
+
+  ;; Line spacing (in pixels)
+  (setq line-spacing 0)
+  
+  ;; Vertical window divider
   (setq window-divider-default-right-width 24)
   (setq window-divider-default-places 'right-only)
   (window-divider-mode 1)
+
+  ;; Nicer glyphs for continuation and wrap 
   (set-display-table-slot standard-display-table
- 'truncation (make-glyph-code ?… 'nano-faded))
+ 'truncation (make-glyph-code ?… 
'nano-faded))
   (set-display-table-slot standard-display-table
- 'wrap (make-glyph-code ?… 'nano-faded)))
-  
+ 'wrap (make-glyph-code ?… 'nano-faded))
+
+  ;; Nerd font for glyph icons
+  (set-fontset-font t '(#xe000 . #xffdd)
+(font-spec :name "RobotoMono Nerd Font Mono")))
+
+
 (defun nano-light ()
   "Nano theme light"
   
   (interactive)
-  (message "Entering nano light mode")
   (setq widget-image-enable nil)
   (setq x-underline-at-descent-line t)
   (set-foreground-color nano-light-foreground)
@@ -248,7 +328,6 @@ background color that is barely perceptible."
   "Nano theme dark"
   
   (interactive)
-  (message "Entering nano dark mode")
   (setq widget-image-enable nil)
   (setq x-underline-at-

[elpa] externals/nano-theme d5affda 04/24: Recommended layout is off

[ELPA Syncer]

branch: externals/nano-theme
commit d5affda8f706f7472db951b2dc789c85095399df
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Recommended layout is off
---
 nano-theme.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nano-theme.el b/nano-theme.el
index 98adf6f..e047acb 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -28,7 +28,7 @@
 (defgroup nano-dark nil
   "Color palette for dark theme" :group 'nano)
 
-(defcustom nano-layout t
+(defcustom nano-layout nil
   "Whether to use recommended nano layout settings.
 
 Layout setting concerns mostly frame size and margin and is only

[elpa] externals/nano-theme 5d4f6c6 20/24: Added GNUS faces and suppressed warnings

[ELPA Syncer]

branch: externals/nano-theme
commit 5d4f6c6dbeba3ba9105f92af0c29d42d17555f85
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Added GNUS faces and suppressed warnings
---
 nano-theme.el | 173 +++---
 1 file changed, 141 insertions(+), 32 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index 1e7164e..a6ec684 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -1,28 +1,55 @@
-;;; nano-theme.el --- NΛNO theme -*- lexical-binding: t -*-
-;; -
-;; GNU Emacs / NΛNO theme
-;; Copyright (C) 2020-2021 - NΛNO developers 
-;;
-;; This program is free software; you can redistribute it and/or modify
+;;; nano-theme.el --- N Λ N O theme -*- lexical-binding: t -*-
+
+;; Copyright (C) 2021 Free Software Foundation, Inc.
+
+;; Maintainer: Nicolas P. Rougier 
+;; URL: https://github.com/rougier/svg-lib
+;; Version: 0.1
+;; Package-Requires: ((emacs "27.1"))
+;; Keywords: theme, dark, light
+
+;; This file is not part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
+
+;; For a full copy of the GNU General Public License
+;; see .
+
+;;; Commentary:
 ;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see .
-;; -
+;; Usage example:
+;;
+;; (nano-light) or (nano-dark)
+;; 
+;; Optionally, you can use (nano-setup) to setup default settings.
+;; Be careful since it will modify your configuration.
+;;
+;; Recommended font is "Roboto Mono" or "Roboto Mono Nerd" if you want
+;; all the fancy glyphs. See https://www.nerdfonts.com.
+
+;;; NEWS:
+
+;; Version 0.1
+;; - Submission to ELPA
+
+
+;;; Code:
 (require 'disp-table)
 
 (deftheme nano
   "N Λ N O Theme")
 
 (defgroup nano nil
-  "N Λ N O")
+  "N Λ N O"
+  :group 'convenience)
 
 (defgroup nano-light nil
   "Light theme color palette" :group 'nano)
@@ -249,10 +276,10 @@ background color that is barely perceptible."
   (setq default-major-mode 'text-mode)
 
   ;; Moderate font lock
-  (setq font-lock-maximum-decoration nil)
+  (setq font-lock-maximum-decoration t)
 
-  ;; No limit on font lock
-  (setq font-lock-maximum-size nil)
+  ;; No limit on font lock (obsolete)
+  ;; (setq font-lock-maximum-size nil)
 
   ;; No line break space points
   (setq auto-fill-mode nil)
@@ -265,6 +292,10 @@ background color that is barely perceptible."
   (setq-default cursor-in-non-selected-windows nil)
   (setq blink-cursor-mode nil)
 
+  ;; No tooltips
+  (if (fboundp 'tooltip-mode)
+  (tooltip-mode -1))
+
   ;; No scroll bars
   (if (fboundp 'scroll-bar-mode)
   (scroll-bar-mode -1))
@@ -297,11 +328,13 @@ background color that is barely perceptible."
   (set-display-table-slot standard-display-table
  'truncation (make-glyph-code ?… 
'nano-faded))
   (set-display-table-slot standard-display-table
- 'wrap (make-glyph-code ?… 'nano-faded))
+ 'wrap (make-glyph-code ?- 'nano-faded))
 
   ;; Nerd font for glyph icons
-  (set-fontset-font t '(#xe000 . #xffdd)
-(font-spec :name "RobotoMono Nerd Font Mono")))
+  (let ((roboto-nerd (font-spec :name "RobotoMono Nerd Font Mono")))
+(if (find-font roboto-nerd)
+(set-fontset-font t '(#xe000 . #xffdd) roboto-nerd)
+  (message "Roboto Mono Nerd font has not been found on your system"
 
 
 (defun nano-light ()
@@ -384,8 +417,9 @@ background color that is barely perceptible."
 ;; ---  Theme --
 (let ((light '((background light)))
   (dark  '((background dark)))
-  (tty-light '((type tty) (background light)))
-  (tty-dark  '((type tty) (background dark
+  ;; (tty-light '((type tty) (background light)))
+  ;; (tty-dark  '((type tty) (background dark)))
+  )
 
   ;; Enforce nano fonts
   (if nano-fonts-use
@@ -425,6 +459,11 @@ background color that is barely perceptible."
  (,dark  (:foreground ,nano-dark-background
   :background ,nano-dark-foreground
 
+   `(mouse ((,light (:foreground ,nano-light-foreground
+ :back

[elpa] externals/nano-theme 28cb699 01/24: Initial import

[ELPA Syncer]

branch: externals/nano-theme
commit 28cb699b8112da0bbc75de05ce8d99685ba261af
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Initial import
---
 LICENSE.txt   | 674 +++
 README.md |  67 
 images/nano-theme-dark-1.png  | Bin 0 -> 224476 bytes
 images/nano-theme-dark-2.png  | Bin 0 -> 506979 bytes
 images/nano-theme-dark-3.png  | Bin 0 -> 496430 bytes
 images/nano-theme-light-1.png | Bin 0 -> 221570 bytes
 images/nano-theme-light-2.png | Bin 0 -> 497684 bytes
 images/nano-theme-light-3.png | Bin 0 -> 491101 bytes
 nano-theme.el | 811 ++
 9 files changed, 1552 insertions(+)

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 000..f288702
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  T

[elpa] externals/nano-theme 99ff1c5 17/24: Removed automatic start

[ELPA Syncer]

branch: externals/nano-theme
commit 99ff1c5e78296a073c6e63b966045e0d83a136e7
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Removed automatic start
---
 nano-theme.el | 48 +++-
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index 8a9e1e4..0344066 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -1,8 +1,7 @@
-;;; nano-theme.el --- A consistent theme for GNU Emacs  -*- coding: utf-8 -*-
-
+;;; nano-theme.el --- NΛNO theme -*- lexical-binding: t -*-
 ;; -
-;; GNU Emacs / N Λ N O theme
-;; Copyright (C) 2021 - Nicolas P. Rougier
+;; GNU Emacs / NΛNO theme
+;; Copyright (C) 2020-2021 - NΛNO developers 
 ;;
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -19,30 +18,34 @@
 ;; -
 
 (deftheme nano
-  "N Λ N O theme")
+  "NΛNO Theme")
 
 (defgroup nano nil
-  "N Λ N O theme.")
+  "NΛNO")
 
 (defgroup nano-light nil
-  "Color palette for light theme" :group 'nano)
+  "Light theme color palette" :group 'nano)
 
 (defgroup nano-dark nil
-  "Color palette for dark theme" :group 'nano)
+  "Dark theme color palette" :group 'nano)
+
+(defgroup nano-fonts nil
+  "Dark & Light theme fonts" :group 'nano)
+
 
 (defface nano-mono
   '((t (:family "Roboto Mono"
:height 140
:weight light)))
   "Default monospaced font (Roboto Mono Light, 14pt)."
-  :group 'nano)
+  :group 'nano-fonts)
 
 (defface nano-mono-alt
   '((t (:family "Fira Code"
:height 140
:weight light)))
   "Alternative monospaced font (Fira Code Light, 14pt)."
-  :group 'nano)
+  :group 'nano-fonts)
 
 
 (defface nano-sans
@@ -50,14 +53,14 @@
:height 140
:weight light)))
   "Default proportional sans font (Roboto Light, 14pt)."
-  :group 'nano)
+  :group 'nano-fonts)
 
 (defface nano-serif
   '((t (:family "Roboto Slab"
:height 140
:weight light)))
   "Default proportional serif font (Roboto Slab Light, 14pt)."
-  :group 'nano)
+  :group 'nano-fonts)
 
 (defcustom nano-light-foreground "#37474F" ;; Blue Grey / L800
   "Default foreground color"
@@ -279,11 +282,12 @@ background color that is barely perceptible."
  (push tag properties)
   properties)))
 
-;; (custom-theme-set-faces 'nano
-;;   '(bold ((t (:inherit nano-strong)
-;;   
-;; (custom-theme-set-faces 'nano
-;;   `(bold ((t ,(inherit 'nano-strong)
+(custom-set-faces 
+ `(bold ((t ,(inherit 'nano-strong)
+
+(custom-theme-set-faces 'nano
+ `(bold ((t ,(inherit 'nano-popout) t
+
 
 
 ;; ---  Theme --
@@ -327,8 +331,8 @@ background color that is barely perceptible."
 (,dark  (:foreground ,nano-dark-background
  :background ,nano-dark-faded

-   `(nano-default ((,light  (:inherit default))
-  (,dark  (:inherit default
+   `(nano-default ((,light  (:foreground ,nano-light-foreground))
+  (,dark  (:foreground ,nano-dark-foreground
 
`(nano-default-i ((,light (:foreground ,nano-light-background
   :background ,nano-light-foreground))
@@ -371,9 +375,11 @@ background color that is barely perceptible."
  :background ,nano-dark-critical
 
`(nano-critical-i ((,light (:foreground ,nano-light-critical
-   :background ,nano-light-background))
+  ;; :background ,nano-light-background
+   ))
   (,dark  (:foreground ,nano-dark-critical
-   :background ,nano-dark-background
+  ;; :background ,nano-dark-background
+   

;; --- Header & mode line ---

[elpa] externals/nano-theme 4a23178 19/24: Fix theme for new frames. Close #6

[ELPA Syncer]

branch: externals/nano-theme
commit 4a231787a32b3019f9f0abb3511a112fd54bf685
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Fix theme for new frames. Close #6
---
 nano-theme.el | 22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/nano-theme.el b/nano-theme.el
index 944f691..1e7164e 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -315,6 +315,15 @@ background color that is barely perceptible."
   (custom-set-variables '(frame-background-mode 'light))
   (load-theme 'nano t)
   (set-frame-parameter nil 'background-mode 'light)
+  (if (assq 'background-color default-frame-alist)
+  (setcdr (assq 'background-color default-frame-alist)
+  nano-light-background)
+(add-to-list 'default-frame-alist
+ `(background-color . ,nano-light-background)))
+  (if (assq 'background-mode default-frame-alist)
+  (setcdr (assq 'background-mode default-frame-alist) 'light)
+(add-to-list 'default-frame-alist '(background-mode . light)))
+
   (dolist (buffer (list " *Minibuf-0*" " *Echo Area 0*"
 " *Minibuf-1*" " *Echo Area 1*"))
 (when (get-buffer buffer)
@@ -335,6 +344,16 @@ background color that is barely perceptible."
   (custom-set-variables '(frame-background-mode 'dark))
   (load-theme 'nano t)
   (set-frame-parameter nil 'background-mode 'dark)
+
+  (if (assq 'background-color default-frame-alist)
+  (setcdr (assq 'background-color default-frame-alist)
+  nano-dark-background)
+(add-to-list 'default-frame-alist
+ `(background-color . ,nano-dark-background)))
+  (if (assq 'background-mode default-frame-alist)
+  (setcdr (assq 'background-mode default-frame-alist) 'dark)
+(add-to-list 'default-frame-alist '(background-mode . dark)))
+
   (dolist (buffer (list " *Minibuf-0*" " *Echo Area 0*"
 " *Minibuf-1*" " *Echo Area 1*"))
 (when (get-buffer buffer)
@@ -508,7 +527,8 @@ background color that is barely perceptible."

;; --- Structural ---
'(bold((t (:inherit nano-strong
-   '(italic  ((t (:slant italic
+   ;; '(italic  ((t (:slant italic
+   '(italic  ((t (:inherit nano-faded
'(bold-italic ((t (:inherit nano-strong
'(region  ((t (:inherit nano-subtle
'(fringe  ((t (:inherit (nano-faded)

[elpa] externals/nano-theme 1ad2168 24/24: Cosmetic changes in comments

[ELPA Syncer]

branch: externals/nano-theme
commit 1ad21687e90e03283f29d5cf6cba29708ad23f92
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Cosmetic changes in comments
---
 nano-theme.el | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index f7d8b41..1286cf4 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -1135,18 +1135,18 @@ background color that is barely perceptible."
 ;; --- Terminal 
 '(term-bold((t (:inherit nano-strong
 '(term-color-black ((t (:inherit default
-'(term-color-blue ((t (:foreground "#42A5F5"   ;; material color blue L400
-   :background "#BBDEFB"  ;; material color blue 
L100
-'(term-color-cyan ((t (:foreground "#26C6DA"   ;; material color cyan L400
-   :background "#B2EBF2"  ;; material color cyan 
L100
-'(term-color-green ((t (:foreground "#66BB6A"   ;; material color green 
L400
-:background "#C8E6C9"  ;; material color green 
L100
-'(term-color-magenta ((t (:foreground "#AB47BC"   ;; material color purple 
L400
-  :background "#E1BEE7"  ;; material color 
purple L100
-'(term-color-red ((t (:foreground "#EF5350"   ;; material color red L400
-  :background "#FFCDD2"  ;; material color red L100
-'(term-color-yellow ((t (:foreground "#FFEE58";; material color yellow 
L400
- :background "#FFF9C4" ;; material color 
yellow L100
+'(term-color-blue ((t (:foreground "#42A5F5";; material color blue 
L400
+   :background "#BBDEFB";; material color blue 
L100
+'(term-color-cyan ((t (:foreground "#26C6DA";; material color cyan 
L400
+   :background "#B2EBF2";; material color cyan 
L100
+'(term-color-green ((t (:foreground "#66BB6A"   ;; material color 
green L400
+:background "#C8E6C9"   ;; material color 
green L100
+'(term-color-magenta ((t (:foreground "#AB47BC" ;; material color 
purple L400
+  :background "#E1BEE7" ;; material color 
purple L100
+'(term-color-red ((t (:foreground "#EF5350" ;; material color red 
L400
+  :background "#FFCDD2" ;; material color red 
L100
+'(term-color-yellow ((t (:foreground "#FFEE58"  ;; material color 
yellow L400
+ :background "#FFF9C4"  ;; material color 
yellow L100
 ))
 
 ;;;###autoload

[elpa] externals/nano-theme ae5d982 16/24: Merge remote-tracking branch 'origin/master'

[ELPA Syncer]

branch: externals/nano-theme
commit ae5d98274a6f19298fbd362371f138a57a514622
Merge: 8d3ae3a 3dd71e1
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Merge remote-tracking branch 'origin/master'
---
 README.md | 11 +++
 nano-theme.el |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/README.md b/README.md
index 16b4660..5dd4a3f 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,17 @@ Install with 
[straight.el](https://github.com/raxod502/straight.el):
:repo "rougier/nano-theme"))
 ```
 
+... or install with [`quelpa`](https://github.com/quelpa/quelpa):
+
+```emacs-lisp
+(use-package nano-theme
+  :ensure nil
+  :defer t
+  :quelpa (nano-theme
+   :fetcher github
+   :repo "rougier/nano-theme"))
+```
+
 ### Usage
 
 Load theme directly: `M-x: (load-theme 'nano t)`  
diff --git a/nano-theme.el b/nano-theme.el
index 58d6a71..8a9e1e4 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -1,3 +1,5 @@
+;;; nano-theme.el --- A consistent theme for GNU Emacs  -*- coding: utf-8 -*-
+
 ;; -
 ;; GNU Emacs / N Λ N O theme
 ;; Copyright (C) 2021 - Nicolas P. Rougier

[elpa] externals-release/org updated (e4c0281 -> 4779a0d)

[ELPA Syncer]

elpasync pushed a change to branch externals-release/org.

  from  e4c0281   Set the MIDI file extension conditionally
   new  0f6e0e8   lisp/org.el: Set the version header to 9.4.7
  adds  353a326   lisp/org.el: Update version to 9.5-dev
  adds  eda0c60   etc/ORG-NEWS: Create an empty section for Org 9.5
  adds  e6021bc   Merge branch 'maint'
  adds  354461b   Merge branch 'maint' into master
  adds  10f4902   Merge branch 'maint' into master
  adds  81125e7   Merge branch 'maint' into master
  adds  814d47d   Merge branch 'maint' into master
  adds  0afef17   Merge branch 'maint' into master
  adds  b64ba64   Merge branch 'maint' into master
  adds  aea1109   Merge branch 'maint' into master
  adds  6c75b00   Allow customised ID format for `ts' `org-id-method'
  adds  d06aa48   Add in support for filling in the bare link in org capture
  adds  2f9e156   org.el: Allow transparent background in latex images
  adds  e2bb605   doc/org-manual.org (Org Crypt): Add info links to epa and 
GnuPG
  adds  83c93e6   org-capture.el: Give a default value when prompting for a 
property
  adds  979e82f   Make sure that headline faces take precedence
  adds  a409e10   ob-java: create package dirs before write to file
  adds  b398110   lisp/ob-java.el: Add Ian Martins as the maintainer
  adds  8f2fb40   Update customize-package-emacs-version-alist
  adds  18099ea   org-capture: Update :package-version for 
org-capture-templates
  adds  bc96649   org-id: Add some keywords to the new org-id-ts-format 
option
  adds  488076e   Describe new %L formatting for org-capture
  adds  8c44f2e   ORG-NEWS: Move org-id-ts-format entry to v9.5 heading
  adds  1d66a58   capture: Fix bare link "Args out of range"
  adds  583ecae   Merge branch 'maint' into master
  adds  4b6495c   ob-python: Improvements to :return header argument
  adds  16f505d   Merge branch 'maint' into master
  adds  920da33   Merge branch 'maint' into master
  adds  262bebb   Merge branch 'maint' into master
  adds  0a854e4   Merge branch 'maint' into master
  adds  10e0e30   Merge branch 'maint' into master
  adds  41651f4   id: Close unnecessary buffers after having looked for an 
ID
  adds  d9884cf   lisp/ob-core.el: Allow passing empty vector to :file-desc 
to omit description
  adds  6a182b6   Merge branch 'maint' into master
  adds  23f9415   Make headline faces precede checkbox statistics
  adds  1f16443   ob-python: Rename exec tmpfile handle to prevent conflict
  adds  ba6cf46   org.el: Avoid repeated calls in 
org-font-lock-add-priority-faces
  adds  8402c4a   Merge branch 'maint' into master
  adds  a88806b   Merge branch 'maint' into master
  adds  343c5e5   Merge branch 'maint'
  adds  e5bf534   Merge branch 'maint'
  adds  7ebb2d5   Review face for export dispatcher highlighted keys
  adds  95ed6ba   ob-gnuplot: Download remote input files
  adds  ae35a34   ob-latex.el: Make latex to svg compilation very 
customizable
  adds  7ae3103   Merge branch 'maint' into master
  adds  d43cc79   Merge branch 'maint' into master
  adds  6edfc2b   ob-java.el: Add support for variables, return values, 
tramp
  adds  045ab00   ob-java.el: Fix spacing in generated main method
  adds  5b6d774   ob-java.el: Allow non-public classes
  adds  5a41c62   ob-java.el: Use customizable commands, avoid 
incompatability
  adds  eecc491   lisp/ob-clojure.el: Add b...@gnu.org as the maintainer
  adds  36f4df8   lisp/ob-R.el: Add Jeremie Juste as a maintainer
  adds  e753766   lisp/ob-abc.el: Add William Waites as the maintainer
  adds  0d314a0   Merge branch 'maint' into master
  adds  1d105a4   lisp/ob-eshell.el: Add stardiviner as the maintainer
  adds  b499b08   lisp/ob-screen.el: Add Ken Mankoff as a maintainer
  adds  4d3eaf8   lisp/ob-mscgen.el: Add Justin Abrahms as the maintainer
  adds  ae7b290   lisp/ob-dot.el: Add Justin Abrahms as the maintainer
  adds  2b3bbf3   x11idle: Make installation a little smoother
  adds  3b382e9   Merge branch 'maint' into master
  adds  ad2115f   ob-gnuplot: Silence byte compiler
  adds  ce02d52   ob-java.el: Change the default back to scripting mode
  adds  2d21c0d   lisp/ob-groovy.el: Add Palak Mathur as a maintainer
  adds  19d2f79   Speedup of org-id-update-id-locations
  adds  8d7a9b4   Hide drawers before first headline properly when cycling 
visibility
  adds  dad436c   Make `org-goto-first-child' behave intuitively before 
first heading
  adds  280a024   Merge branch 'maint' into master
  adds  93325df   ox.el: Add missing polish translations in export 
dictionary
  adds  3f1c044   ob-core: Drop redundant Edebug specification list
  adds  3cc15f9   org-manual.org: Remove language list and fix Worg link
  adds  8ba7cf1   manual: Drop orphan footno

[elpa] externals/nano-theme 2c252fe 22/24: Minor correction in documentation

[ELPA Syncer]

branch: externals/nano-theme
commit 2c252feb514b3f763a50be2f1d2e23472456ed4f
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Minor correction in documentation
---
 nano-theme.el | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index ab6bd38..d400c83 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -26,10 +26,10 @@
 ;;; Commentary:
 ;;
 ;; N Λ N O theme is a consistent theme that comes in two flavors:
-;;  - light theme is based on Material (https://material.io/)
-;;  - the dark theme is based on Nord (https://www.nordtheme.com/).
+;;  - a light theme that is based on Material (https://material.io/)
+;;  - a dark theme that is based on Nord (https://www.nordtheme.com/).
 ;;
-;; The theme is fully defined by a set of (1+6) faces as
+;; A theme is fully defined by a set of (1+6) faces as
 ;; explained in this paper https://arxiv.org/abs/2008.06030:
 ;;
 ;; - Default face is the face for regular information.
@@ -74,17 +74,19 @@
 ;; information and this can be made by setting a very light
 ;; background color that is barely perceptible.
 ;;
-;;
+
 ;; Usage example:
 ;;
-;; You can use the theme as a regular theme or you can
-;; (nano-light) / (nano-dark) to isntall the light or dark version.
+;; You can use the theme as a regular theme or you can call
+;; (nano-light) / (nano-dark) explicitely to install the light or dark
+;; version.
 ;; 
-;; Optionally, you can use (nano-setup) to setup default settings.
-;; Be careful since it will modify your configuration.
+;; Optionally, you can use (nano-setup) to setup default settings.  Be
+;; careful since it will modify your configuration and requires
+;; specific fonts.
 ;;
 ;; Recommended font is "Roboto Mono" or "Roboto Mono Nerd" if you want
-;; all the fancy glyphs. See https://www.nerdfonts.com.
+;; to benefit from all the fancy glyphs. See https://www.nerdfonts.com.
 
 ;;; NEWS:
 

[elpa] externals/nano-theme c615b55 05/24: Added a nano-mode function to apply recommended settings

[ELPA Syncer]

branch: externals/nano-theme
commit c615b55b02f1e8b810b5d8e3c30bc92bfce2b9a3
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Added a nano-mode function to apply recommended settings
---
 nano-theme.el | 71 +++
 1 file changed, 33 insertions(+), 38 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index e047acb..f95caa5 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -28,13 +28,6 @@
 (defgroup nano-dark nil
   "Color palette for dark theme" :group 'nano)
 
-(defcustom nano-layout nil
-  "Whether to use recommended nano layout settings.
-
-Layout setting concerns mostly frame size and margin and is only
-active with 'nano-light and 'nano-dark functions."
-  :type 'boolean :group 'nano)
-
 (defface nano-mono
   '((t (:family "Roboto Mono"
:height 140
@@ -204,34 +197,24 @@ background color that is barely perceptible."
 (defface nano-default-i nil
   "Default face inversed." :group nil)
 
-(defun nano-mode ()
-  "Nano theme mode settings (dark & light)"
-
-  (when nano-layout
-(set-frame-parameter nil 'internal-border-width 24)
-(set-frame-parameter nil 'width 81)
-(set-frame-parameter nil 'height 45)
-(set-frame-parameter nil 'left-fringe 0)
-(set-frame-parameter nil 'right-fringe 0)
-(set-display-table-slot standard-display-table 'truncation ?…)
-(set-display-table-slot standard-display-table 'wrap ?—)
-(if (fboundp 'tool-bar-mode) (tool-bar-mode nil))
-(tooltip-mode 0)
-(scroll-bar-mode 0)
-(menu-bar-mode 0)
-(setq window-divider-default-right-width 24)
-(setq window-divider-default-places 'right-only)
-(window-divider-mode 1))
-  
-  (setq widget-image-enable nil)
-  (setq x-underline-at-descent-line t)
-  (setq-default indent-tabs-mode nil)
-  
-  (dolist (buffer (list " *Minibuf-0*" " *Echo Area 0*"
-" *Minibuf-1*" " *Echo Area 1*"))
-(when (get-buffer buffer)
-  (with-current-buffer buffer
-(face-remap-add-relative 'default 'nano-faded)
+(defun nano-setup ()
+  "Nano recommend settings (optional)"
+
+  (interactive)
+  (set-frame-parameter nil 'internal-border-width 24)
+  (set-frame-parameter nil 'width 81)
+  (set-frame-parameter nil 'height 45)
+  (set-frame-parameter nil 'left-fringe 0)
+  (set-frame-parameter nil 'right-fringe 0)
+  (if (fboundp 'tool-bar-mode) (tool-bar-mode nil))
+  (tooltip-mode 0)
+  (scroll-bar-mode 0)
+  (menu-bar-mode 0)
+  (setq window-divider-default-right-width 24)
+  (setq window-divider-default-places 'right-only)
+  (window-divider-mode 1)
+  (set-display-table-slot standard-display-table 'truncation ?…)
+  (set-display-table-slot standard-display-table 'wrap ?—))
 
   
 (defun nano-light ()
@@ -239,13 +222,19 @@ background color that is barely perceptible."
   
   (interactive)
   (message "Entering nano light mode")
+  (setq widget-image-enable nil)
+  (setq x-underline-at-descent-line t)
   (set-foreground-color nano-light-foreground)
   (set-face-background 'internal-border nano-light-background (selected-frame))
   (custom-set-variables '(frame-background-mode 'light))
   (load-theme 'nano t)
   (set-frame-parameter nil 'background-mode 'light)
-  (nano-mode)
-  (frame-set-background-mode (selected-frame) t )
+  (dolist (buffer (list " *Minibuf-0*" " *Echo Area 0*"
+" *Minibuf-1*" " *Echo Area 1*"))
+(when (get-buffer buffer)
+  (with-current-buffer buffer
+(face-remap-add-relative 'default 'nano-faded
+  (frame-set-background-mode (selected-frame))
   (set-background-color nano-light-background))
 
 
@@ -254,12 +243,18 @@ background color that is barely perceptible."
   
   (interactive)
   (message "Entering nano dark mode")
+  (setq widget-image-enable nil)
+  (setq x-underline-at-descent-line t)
   (set-foreground-color nano-dark-foreground)
   (set-face-background 'internal-border nano-dark-background (selected-frame))
   (custom-set-variables '(frame-background-mode 'dark))
   (load-theme 'nano t)
   (set-frame-parameter nil 'background-mode 'dark)
-  (nano-mode)
+  (dolist (buffer (list " *Minibuf-0*" " *Echo Area 0*"
+" *Minibuf-1*" " *Echo Area 1*"))
+(when (get-buffer buffer)
+  (with-current-buffer buffer
+(face-remap-add-relative 'default 'nano-faded
   (frame-set-background-mode (selected-frame))
   (set-background-color nano-dark-background))
 

[elpa] externals/nano-theme a9e0ddd 21/24: Added documentation

[ELPA Syncer]

branch: externals/nano-theme
commit a9e0dddf7ea001a92b6f3894cb775e1faeb29f33
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Added documentation
---
 nano-theme.el | 55 +--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/nano-theme.el b/nano-theme.el
index a6ec684..ab6bd38 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2021 Free Software Foundation, Inc.
 
 ;; Maintainer: Nicolas P. Rougier 
-;; URL: https://github.com/rougier/svg-lib
+;; URL: https://github.com/rougier/nano-theme
 ;; Version: 0.1
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: theme, dark, light
@@ -25,9 +25,60 @@
 
 ;;; Commentary:
 ;;
+;; N Λ N O theme is a consistent theme that comes in two flavors:
+;;  - light theme is based on Material (https://material.io/)
+;;  - the dark theme is based on Nord (https://www.nordtheme.com/).
+;;
+;; The theme is fully defined by a set of (1+6) faces as
+;; explained in this paper https://arxiv.org/abs/2008.06030:
+;;
+;; - Default face is the face for regular information.
+;;
+;; - Critical face is for information that requires immediate action.
+;;
+;; It should be of high constrast when compared to other
+;; faces. This can be realized (for example) by setting an intense
+;; background color, typically a shade of red. It must be used
+;; scarcely.
+;;
+;; - Popout face is used for information that needs attention.
+;;
+;; To achieve such effect, the hue of the face has to be
+;; sufficiently different from other faces such that it attracts
+;; attention through the popout effect.
+;;
+;; - Strong face is used for information of a structural nature.
+;;
+;; It has to be the same color as the default color and only the
+;; weight differs by one level (e.g., light/regular or
+;; regular/bold). IT is generally used for titles, keywords,
+;; directory, etc.
+;;
+;; - Salient face is used for information that are important.
+;;
+;; To suggest the information is of the same nature but important,
+;; the face uses a different hue with approximately the same
+;; intensity as the default face. This is typically used for
+;; links.
+
+;; - Faded face is for information that are less important.
+;;
+;; It is made by using the same hue as the default but with a
+;; lesser intensity than the default. It can be used for comments,
+;; secondary information and also replace italic (which is
+;; generally abused anyway
+;;
+;; - Subtle face is used to suggest a physical area on the screen.
+;;
+;; It is important to not disturb too strongly the reading of
+;; information and this can be made by setting a very light
+;; background color that is barely perceptible.
+;;
+;;
 ;; Usage example:
 ;;
-;; (nano-light) or (nano-dark)
+;; You can use the theme as a regular theme or you can
+;; (nano-light) / (nano-dark) to isntall the light or dark version.
 ;; 
 ;; Optionally, you can use (nano-setup) to setup default settings.
 ;; Be careful since it will modify your configuration.

[elpa] externals-release/org 0f6e0e8 4/9: lisp/org.el: Set the version header to 9.4.7

[ELPA Syncer]

branch: externals-release/org
commit 0f6e0e86c6d51f6c2fec9e0aa915b39da9ac0716
Author: Bastien 
Commit: Bastien 

lisp/org.el: Set the version header to 9.4.7
---
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index cfa5f6c..65f63c1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8,7 +8,7 @@
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 
-;; Version: 9.4.6
+;; Version: 9.4.7
 
 ;; This file is part of GNU Emacs.
 ;;

[elpa] externals-release/org 0a86adc 5/9: lisp/org.el: Set version header to 9.5

[ELPA Syncer]

branch: externals-release/org
commit 0a86adc1270a9a0e98815c8125bb2c6bb9451359
Author: Bastien 
Commit: Bastien 

lisp/org.el: Set version header to 9.5
---
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 6d87d95..2ec6566 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9,7 +9,7 @@
 ;; Homepage: https://orgmode.org
 ;; Package-Requires: ((emacs "25.1"))
 
-;; Version: 9.5-dev
+;; Version: 9.5
 
 ;; This file is part of GNU Emacs.
 ;;

[elpa] externals-release/org 1344911 2/9: lisp/ob-R.el: Fix compiler warnings

[ELPA Syncer]

branch: externals-release/org
commit 1344911585384f6b73c98a80bc85a4f5d81b9d52
Author: Bastien 
Commit: Bastien 

lisp/ob-R.el: Fix compiler warnings
---
 lisp/ob-R.el | 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index db52773..169e1d6 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -40,6 +40,13 @@
 (declare-function ess-wait-for-process "ext:ess-inf"
  (&optional proc sec-prompt wait force-redisplay))
 
+;; FIXME: Temporary declaration to silence the byte-compiler
+(defvar user-inject-src-param)
+(defvar ess-eval-visibly-tmp)
+(defvar ess-eval-visibly)
+(defvar ess-inject-source)
+(defvar user-inject-src-param)
+
 (defconst org-babel-header-args:R
   '((width  . :any)
 (height . :any)
@@ -479,7 +486,7 @@ Insert hline if column names in output have been requested."
 (defconst ob-session-async-R-indicator "'ob_comint_async_R_%s_%s'")
 
 (defun ob-session-async-org-babel-R-evaluate-session
-(session body result-type result-params column-names-p row-names-p)
+(session body result-type _ column-names-p row-names-p)
   "Asynchronously evaluate BODY in SESSION.
 Returns a placeholder string for insertion, to later be replaced
 by `org-babel-comint-async-filter'."
@@ -527,12 +534,12 @@ by `org-babel-comint-async-filter'."
  (insert "\n")
  (insert (format ob-session-async-R-indicator
 "end" uuid))
- (setq tmp ess-eval-visibly)
+ (setq ess-eval-visibly-tmp ess-eval-visibly)
  (setq user-inject-src-param ess-inject-source)
  (setq ess-eval-visibly nil)
- (setq  ess-inject-source 'function-and-buffer)
+ (setq ess-inject-source 'function-and-buffer)
  (ess-eval-buffer nil))
-   (setq ess-eval-visibly tmp)
+   (setq ess-eval-visibly ess-eval-visibly-tmp)
(setq ess-inject-source user-inject-src-param)
uuid
 

[elpa] externals/nano-theme 73c3be1 09/24: Added header line customization

[ELPA Syncer]

branch: externals/nano-theme
commit 73c3be10e1b5f347950a2a89a0cc566d78143c7e
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Added header line customization
---
 nano-theme.el | 9 +
 1 file changed, 9 insertions(+)

diff --git a/nano-theme.el b/nano-theme.el
index f95caa5..88a6193 100644
--- a/nano-theme.el
+++ b/nano-theme.el
@@ -375,6 +375,15 @@ background color that is barely perceptible."
:color ,nano-dark-subtle
:style nil)
 
+   `(header-line ((,light (:foreground ,nano-light-foreground
+   :background ,nano-light-subtle
+   :inherit nil
+   :box nil))
+ (,dark  (:foreground ,nano-dark-foreground
+  :background ,nano-dark-subtle
+   :inherit nil
+   :box nil
+
;; --- Structural -
'(bold((t (:inherit nano-strong
'(italic  ((t (:slant italic

[elpa] externals-release/org 1d5e41d 1/9: lisp/ob-core.el (org-babel-eval-headers): Fix elements ordering

[ELPA Syncer]

branch: externals-release/org
commit 1d5e41d41ba878424eb87115f9ddab3c9edf44a0
Author: Bastien 
Commit: Bastien 

lisp/ob-core.el (org-babel-eval-headers): Fix elements ordering

* lisp/ob-core.el (org-babel-eval-headers): Fix elements ordering.
(org-babel-merge-params): Tiny refactoring.

This fixes the test `test-ob-lob/call-with-header-arguments' that
fails after 9f1507bdd.
---
 lisp/ob-core.el | 25 +
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index ec1191e..4b7de5f 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -609,8 +609,6 @@ multiple blocks are being executed (e.g., in chained 
execution
 through use of the :var header argument) this marker points to
 the outer-most code block.")
 
-(defvar *this*)
-
 (defun org-babel-eval-headers (headers)
   "Compute header list set with HEADERS.
 
@@ -618,11 +616,10 @@ Evaluate all header arguments set to functions prior to 
returning
 the list of header arguments."
   (let ((lst nil))
 (dolist (elem headers)
-  (if (and (cdr elem)
-  (functionp (cdr elem)))
+  (if (and (cdr elem) (functionp (cdr elem)))
   (push `(,(car elem) . ,(funcall (cdr elem))) lst)
 (push elem lst)))
-lst))
+(reverse lst)))
 
 (defun org-babel-get-src-block-info (&optional light datum)
   "Extract information from a source block or inline source block.
@@ -2739,21 +2736,17 @@ parameters when merging lists."
  results-exclusive-groups
  results
  (split-string
-  (if (stringp value)
-  value
-(if (functionp value)
-(funcall value)
-  (eval value t)))
+  (cond ((stringp value) value)
+ ((functionp value) (funcall value))
+ (t (eval value t)))
  (`(:exports . ,value)
   (setq exports (funcall merge
  exports-exclusive-groups
  exports
- (split-string (or
-(if value
-(if (functionp value)
-(funcall value)
-  value)
-  ""))
+ (split-string
+   (cond ((and value (functionp value)) 
(funcall value))
+ (value value)
+ (t ""))
  ;; Regular keywords: any value overwrites the previous one.
  (_ (setq params (cons pair (assq-delete-all (car pair) params)))
 ;; Handle `:var' and clear out colnames and rownames for replaced

[elpa] externals-release/org a7e4339 7/9: etc/ORG-NEWS: Fix section title

[ELPA Syncer]

branch: externals-release/org
commit a7e4339f6893b2f84ab963bbfb43a5e06a8377ab
Author: Bastien 
Commit: Bastien 

etc/ORG-NEWS: Fix section title
---
 etc/ORG-NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 17f8512..cbb0d38 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -11,7 +11,7 @@ See the end of the file for license conditions.
 
 Please send Org bug reports to mailto:emacs-orgm...@gnu.org.
 
-* Version 9.5 (not yet released)
+* Version 9.5
 
 ** Important announcements and breaking changes
 

[elpa] externals-release/org e68375e 8/9: Merge branch 'main' into bugfix

[ELPA Syncer]

branch: externals-release/org
commit e68375eabc983611d48e42fa5ce75521006593a2
Merge: 7d223a8 a7e4339
Author: Bastien 
Commit: Bastien 

Merge branch 'main' into bugfix
---
 etc/ORG-NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 17f8512..cbb0d38 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -11,7 +11,7 @@ See the end of the file for license conditions.
 
 Please send Org bug reports to mailto:emacs-orgm...@gnu.org.
 
-* Version 9.5 (not yet released)
+* Version 9.5
 
 ** Important announcements and breaking changes
 

[elpa] externals-release/org 4779a0d 9/9: mk/server.mk: Resurrect a simplified version

[ELPA Syncer]

branch: externals-release/org
commit 4779a0df5d14feed234b5fc056ffd2429990746a
Author: Bastien 
Commit: Bastien 

mk/server.mk: Resurrect a simplified version
---
 mk/server.mk | 54 ++
 1 file changed, 54 insertions(+)

diff --git a/mk/server.mk b/mk/server.mk
new file mode 100644
index 000..128c083
--- /dev/null
+++ b/mk/server.mk
@@ -0,0 +1,54 @@
+#
+# This file is used to upload the Org documentation to the server
+#
+.PHONY:helpserver \
+   doc-up \
+   upload \
+   tagwarn version
+
+help helpserver::
+   $(info )
+   $(info Maintenance)
+   $(info ===)
+   $(info upload  - clean up, populate the server with 
documentation)
+
+helpserver::
+   @echo ""
+
+#--
+
+SERVROOT ?= upload
+SERVERMK ?= true # or just any value at all, really
+
+#--
+
+release:   cleanall info pdf card tagwarn
+
+PKG_TAG = $(shell date +%Y%m%d)
+PKG_DOC = "Outline-based notes management and organizer"
+PKG_REQ = "" # marmalade chokes on explicit "nil"
+
+tagwarn:
+   $(if $(filter-out $(ORGVERSION), $(GITVERSION)), \
+ $(info  ==) \
+ $(info  ==) \
+ $(info  = A release should only be made from a revision that =) \
+ $(info  = has an annotated tag!  =) \
+ $(info  ==) \
+ $(info  ==))
+
+version:
+   @echo ORGVERSION=$(ORGVERSION) GITVERSION=$(GITVERSION)$(ORGDIST)
+   @echo "ORGVERSION   ?= $(ORGVERSION)"  > mk/version.mk
+   @echo "GITVERSION   ?= $(GITVERSION)" >> mk/version.mk
+
+doc-up:info pdf card html
+   $(MAKE) -C doc manual guide
+   $(CP) doc/org.html  $(SERVROOT)
+   $(CP) doc/org.pdf   $(SERVROOT)
+   $(CP) doc/orgguide.html $(SERVROOT)
+   $(CP) doc/orgguide.pdf  $(SERVROOT)
+   $(CP) doc/manual/*  $(SERVROOT)/manual
+   $(CP) doc/guide/*   $(SERVROOT)/guide
+
+upload:cleanall doc-up

[elpa] externals/svg-lib 774fa4e: Bump version number

[ELPA Syncer]

branch: externals/svg-lib
commit 774fa4e200a73f55b57316aee88ad6637ee329ab
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Bump version number
---
 svg-lib.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/svg-lib.el b/svg-lib.el
index 6175f47..16a8b63 100644
--- a/svg-lib.el
+++ b/svg-lib.el
@@ -4,7 +4,7 @@
 
 ;; Maintainer: Nicolas P. Rougier 
 ;; URL: https://github.com/rougier/svg-lib
-;; Version: 0.1
+;; Version: 0.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: svg, icons, tags, convenience
 

[elpa] externals/org updated (32b9251 -> 4779a0d)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  32b9251   Parse titleless headlines with a tag correctly
   new  0f6e0e8   lisp/org.el: Set the version header to 9.4.7
   new  1d5e41d   lisp/ob-core.el (org-babel-eval-headers): Fix elements 
ordering
   new  1344911   lisp/ob-R.el: Fix compiler warnings
   new  80b2aa4   Fix 1d5e41d41
   new  0a86adc   lisp/org.el: Set version header to 9.5
   new  7d223a8   Merge branch 'main' into bugfix
   new  a7e4339   etc/ORG-NEWS: Fix section title
   new  e68375e   Merge branch 'main' into bugfix
   new  4779a0d   mk/server.mk: Resurrect a simplified version


Summary of changes:
 etc/ORG-NEWS|  2 +-
 lisp/ob-R.el| 15 +++
 lisp/ob-core.el | 28 
 lisp/org.el |  2 +-
 mk/server.mk| 54 ++
 5 files changed, 79 insertions(+), 22 deletions(-)
 create mode 100644 mk/server.mk

[nongnu] branch elpa/vc-fossil created (now 7815c30)

[ELPA Syncer]

elpasync pushed a change to branch elpa/vc-fossil.

at  7815c30   vc-fossil.el: Update from fossil.

This branch includes the following new commits:

   new  b45607b   initial empty check-in
   new  fe0b3f0   Initial Revision
   new  82fd031   Initial Doc
   new  9d9e0e6   Changes to work with fossil branch venks-emacs tip (Use 
update current).
   new  6e33fff   Change documentation to reflect new venks-emacs thread.
   new  f348507   Adding missing 
   new  ac53c94   Add emacs 23.1 as a requirement in the documenation.
   new  a6f36f1   2 edited files have already merged into fossil trunk.  
Only one file needs changes - note that.
   new  15d0461   Remove --brief from file log.  Still used in 
next-rev/prev-rev.
   new  0bd29ae   Simplified version of vc-fossil-registered.
   new  70efbef   Note that fossil trunk now has all required changes.
   new  7e98e83   Remove debug message.
   new  f29eee9   Revert previous checkin.  Remove debug message.  Make 
vc-fossil-registered work with files outside fossil trees.
   new  43f9868   Add "ADD" as a possible state reported by fossil - also 
mapped to needs-update
   new  086622b   Handle headers in update -n -v (currently ignore any line 
with a :).
   new  3c8fae8   Mulitple changes to allow 23.2 integration and to fix 
fossil-state-code incorrectly still using --file to update -n -v
   new  cb4cd3f   Fossil version 3af6cf0993, moves update to end, 
simplifying our parsing.
   new  aff450c   deal with some compiler warnings (assignments to line etc 
remain)
   new  b1429cb   flush assignment warnings via let augmentation
   new  56b4562   tweak doc: compile command, and don't smash other VCs off 
vc-handled-backends
   new  9856860   appropriate autoload, and consistent "add fossil" 
expression in docs
   new  5a8e1a3   autoload in docs
   new  0921094   whitespace and fiddle with a instructions comment
   new  eeb48f4   fiddle with some if constructs so I can read this
   new  0da61d3   standard comment style
   new  d844871   typo in emacs keystroke in documentation
   new  1d46c62   eschew some redundancy, and use modern apply syntax
   new  9e52264   emacs style (cont), some logic issues seem apparent...
   new  5e71178   ideomatic lisp
   new  419877b   squelch dead computation; clarify logic
   new  00ff203   Allow .fslckout in Unix as fossil db name. (for  
[769989987d])
   new  403712d   Fossil gets confused traversing through symlinks.  Use 
file-truename in multiple places to get past that.
   new  bf1969f   Undo file-truename in log because emacs-23.3.1 gives 
relative names which confuse fossil.
   new  adb17bcUse file-truename in vc-fossil-state otherwise status is 
not returned if called from outside a fossil tree
   new  fe3e0d3   Enable vc-ediff to work.  Thanks to folks who contributed 
in [8521322bc9]
   new  13a0a69   Untabify
   new  0497f8f   Remove some old debug messages.
   new  9d2d9f8   Refactoring of `vc-fossil-dir-status`.
   new  c058f3d   Remove debug message from `vc-fossil-after-dir-status`.
   new  c1585fc   Remove `vc-fossil-after-dir-status`.
   new  1319569   Show unregistered files in dir stat.
   new  c642a01   Pass `vc-checkin-switches` on checkin.
   new  f0f81f8   Fix `vc-fossil-find-revision`.
   new  f4795ba   Pass `vc-checkout-switches` on checkout.
   new  54df12a   Fix parameter passing in `vc-fossil-find-revision`.
   new  49552ae   Delete and rename modify working directory.
   new  f69eac0   Add end-of-file comment.
   new  6619ffb   Improve log command.
   new  3455e4a   Access command switches by `vc-switches`.
   new  b632993   Handle switches in diff command.
   new  560d708   Implement annotate commanad.
   new  4ce0039   Enable word-wrap with indentation in log view.
   new  169cff6   Suppress echo message when enabling word wrap in log view.
   new  798b503   Fix file name expansion in log command.
   new  9f31709   Fix diff command if old rev is not specified.
   new  ec551ba   Implement previous-revision command for whole repository.
   new  0ab9dce   Implement diff for the root directory.
   new  ec8c00c   Fix extraction of revision in annotate buffer.
   new  866bd8d   Use relative file names in print-log command.
   new  e2ec578   Use `vc-fossil-command` if the output is inserted in a 
buffer.
   new  a57356e   Refactor find-revision command.
   new  141937e   Fix checkout command for special revisions.
   new  03282dc   Implement next-revision command for whole repository.
   new  6eb44a2   Refactor next-revision and previous-revision commands.
   new  ac82044   Do not raise errors in next-revision and 
previous-revision commands.
   new  be45ea1   Declare some unknown function and variables.
   new  5b0c159   Updates from

[nongnu] elpa/vc-fossil b45607b 001/111: initial empty check-in

[ELPA Syncer]

branch: elpa/vc-fossil
commit b45607bcae00f587e4a17936109c50fed55663ea
Author: venks 
Commit: venks 

initial empty check-in

[nongnu] elpa/vc-fossil 9d9e0e6 004/111: Changes to work with fossil branch venks-emacs tip (Use update current).

[ELPA Syncer]

branch: elpa/vc-fossil
commit 9d9e0e6a7299d7dc38552132978a2c6d924797ad
Author: venkat 
Commit: venkat 

Changes to work with fossil branch venks-emacs tip (Use update current).
---
 vc/el/vc-fossil.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index ddb4513..74d372e 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -131,13 +131,13 @@
 (defun vc-fossil-dir-status (dir update-function)
   "Get Fossil status for all files in a directory"
   ;(message dir)
-  (insert (vc-fossil--run "update" "-n" "-v" "--file" dir))
+  (insert (vc-fossil--run "update" "-n" "-v" "current" dir))
   (let* ((result)
 (root (vc-fossil-root dir)))
 (goto-char (point-min))
 (while (not (eobp))
   (setq line (buffer-substring-no-properties (point) (line-end-position)))
-  (message line)
+  ;(message line)
   (setq status-word (car (split-string line)))
   (setq state (vc-fossil-state-code status-word))
   (setq file (substring line (+ (length status-word) 1)))

[nongnu] elpa/vc-fossil fe0b3f0 002/111: Initial Revision

[ELPA Syncer]

branch: elpa/vc-fossil
commit fe0b3f0e94415e7fe984bd3a1c3b78d38a87cb1c
Author: venkat 
Commit: venkat 

Initial Revision
---
 vc/el/vc-fossil.el | 308 +
 1 file changed, 308 insertions(+)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
new file mode 100644
index 000..ddb4513
--- /dev/null
+++ b/vc/el/vc-fossil.el
@@ -0,0 +1,308 @@
+;;; vc-fossil.el --- VC backend for the fossil sofware configuraiton 
management system
+;; Author: Venkat Iyer 
+
+;;; Commentary:
+
+;; This file contains a VC backend for the fossil version control
+;; system.
+;;
+
+;;; Installation:
+
+;; 1. Put this file somewhere in the emacs load-path.  2. Add Fossil
+;; to the list of supported backends in `vc-handled-backends'
+;;
+;; e.g.(add-to-list 'vc-handled-backends 'Fossil)
+
+;;; Implemented Functions
+;; BACKEND PROPERTIES
+;; * revision-granularity
+;; STATE-QUERYING FUNCTIONS
+;; * registered (file)   
+;; * state (file) - 'up-to-date 'edited 'needs-patch 'needs-merge 
+;; * workfile-version (file)
+;; * checkout-model (file)
+;; - workfile-unchanged-p (file)
+;; STATE-CHANGING FUNCTIONS
+;; * register (file &optional rev comment)
+;; * checkin (file rev comment)
+;; * find-version (file rev buffer)
+;; * checkout (file &optional editable rev)
+;; * revert (file &optional contents-done)
+;; - responsible-p (file)
+;; HISTORY FUNCTIONS
+;; * print-log (file &optional buffer)
+;; * diff (file &optional rev1 rev2 buffer)
+;; MISCELLANEOUS
+;; - delete-file (file)
+;; - rename-file (old new)
+
+(eval-when-compile (require 'vc))
+
+;;; BACKEND PROPERTIES
+
+(defun vc-fossil-revision-granularity () 'repository)
+
+
+;; Internal Commands
+
+(defun vc-fossil--call (buffer &rest args)
+  (apply 'process-file "fossil" nil buffer nil args))
+
+(defun vc-fossil--out-ok (&rest args)
+  (zerop (apply 'vc-fossil--call '(t nil) args)))
+
+(defun vc-fossil--run (&rest args)
+  "Run a fossil command and return its output as a string"
+  (let* ((ok t)
+ (str (with-output-to-string
+(with-current-buffer standard-output
+  (unless (apply 'vc-fossil--out-ok args)
+(setq ok nil))
+(and ok str)))
+
+(defun vc-fossil-root (file)
+  (vc-find-root file "_FOSSIL_"))
+
+(defun vc-fossil-command (buffer okstatus file-or-list &rest flags)
+  "A wrapper around `vc-do-command' for use in vc-fossil.el.
+  The difference to vc-do-command is that this function always invokes 
`fossil'."
+  (apply 'vc-do-command (or buffer "*vc*") okstatus "fossil" file-or-list 
flags))
+
+(defun vc-fossil-get-id (dir)
+  (let* ((default-directory dir)
+(info (vc-fossil--run "info"))
+(pos (string-match "checkout: *\\([0-9a-fA-F]+\\)" info))
+(uid (match-string 1 info))
+)
+(substring uid 0 9)))
+
+;;; STATE-QUERYING FUNCTIONS
+
+(defun vc-fossil-registered (file)
+  "Check whether FILE is registered with fossil."
+  (when (vc-fossil-root file)
+(with-temp-buffer
+  (let* ((dir (file-name-directory file))
+(name (file-relative-name file dir))
+(str (ignore-errors
+   (when dir (cd dir))
+   (vc-fossil--out-ok "finfo" "-s" name)
+   (buffer-string
+(and str
+   (not (string= (substring str 0 7) "unknown")))
+
+(defun vc-fossil-state-code (code)
+  (if (not code)
+  'unregistered
+(let ((state (cond 
+ ((string= code "UNKNOWN")   'unregistered)
+ ((string= code "UNCHANGED") 'up-to-date)
+ ((string= code "CONFLICT")  'edited)
+ ((string= code "ADDED") 'added)
+ ((string= code "EDITED")'edited)
+ ((string= code "REMOVE")'removed)
+ ((string= code "UPDATE")'needs-update)
+ ((string= code "MERGE") 'needs-merge
+  (if state state
+   (error "Cannot handle fossil state code %s" code)
+
+
+(defun vc-fossil-state  (file)
+  "Fossil specific version of `vc-state'."
+  ; (message (format "vc-fossil-state on %s" file))
+  (let ((line (vc-fossil--run "update" "-n" "-v" "--file" file)))
+(and line
+(vc-fossil-state-code (car (split-string line))
+
+(defun vc-fossil-working-revision (file)
+  "Fossil Specific version of `vc-working-revision'."
+  (let ((line (vc-fossil--run "finfo" "-s" file)))
+(and line
+(car (cdr (split-string line))
+
+(defun vc-fossil-workfile-unchanged-p (file)
+  (eq 'up-to-date (vc-fossil-state file)))
+
+;; TODO: mode-line-string
+;; TODO: dir-printer  / dir-extra-headers
+
+
+(defun vc-fossil-dir-status (dir update-function)
+  "Get Fossil status for all files in a directory"
+  ;(message dir)
+  (insert (vc-fossil--run "update" "-n" "-v" "--file" dir))
+  (let* ((result)
+(root (vc-fossil-root dir)))
+(goto-char (point-min))
+(while (not (eobp))
+  (setq line (b

[nongnu] elpa/vc-fossil 7e98e83 012/111: Remove debug message.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 7e98e8305dc9f34ed186385125ddcbfbd156e3a9
Author: venkat 
Commit: venkat 

Remove debug message.
---
 vc/el/vc-fossil.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 9f7486e..0cce07e 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -84,7 +84,7 @@
   (with-temp-buffer
 (let* ((str (ignore-errors
 (vc-fossil--out-ok "finfo" "-s" (file-truename file))
-(message (buffer-string)
+(buffer-string
   (and str
   (not (string= (substring str 0 7) "unknown"))
 

[nongnu] elpa/vc-fossil f348507 006/111: Adding missing

[ELPA Syncer]

branch: elpa/vc-fossil
commit f3485075f248432490f55a0f07f81478cee4645d
Author: venkat 
Commit: venkat 

Adding missing 
---
 doc/index.wiki | 91 +-
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/doc/index.wiki b/doc/index.wiki
index c113acc..2d035ae 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -1,45 +1,46 @@
-Emacs Integration for Fossil
-
-This mini-project is for integrating emacs into fossil.  This needs a
-few changes into fossil and needs a new file to be loaded into emacs.
-
-How Do I load Fossil support into emacs?
-
-Short answer:
-
-Add this to your .emacs file, or cut and paste this into *scratch* buffer and 
do
-C-x e to execute it.   
-
-
-(setq vc-handled-backends '(CVS Fossil))
-(load-file "/path/to/this/project/vc/el/vc-fossil.el")
-
-
-What changes to fossil are required
-
-There are a few changes required to 3 files (src/file.c, src/finfo.c
-and src/update.c) in the fossil tree.  These are currently in the
-fossil repository in the "venks-emacs" branch.  In the fossil source
-checkout do this:
-
-
-% fossil update venks-emacs
-% make
-  
-That builds you a fossil executable which can be used by this
-emacs elisp package
-
-What emacs keys do I need?
-
-This integrates fossil into emacs vc builtin mode.  The same keys will
-work for fossil inside a fossil tree as for other scms outside.
-
-A few are:
-
-
-C-x v dRun Fossil dired - like 
cvs-examine
-C-x v lWhen in a file, show log
-vIn VC, do next action: 
merge/update/checkin
-
-
-
+Emacs Integration for Fossil
+
+This mini-project is for integrating emacs into fossil.  This needs a
+few changes into fossil and needs a new file to be loaded into emacs.
+
+How Do I load Fossil support into emacs?
+
+Short answer:
+
+Add this to your .emacs file, or cut and paste this into *scratch* buffer and 
do
+C-x e to execute it.   
+
+
+(setq vc-handled-backends '(CVS Fossil))
+(load-file "/path/to/this/project/vc/el/vc-fossil.el")
+
+
+What changes to fossil are required
+
+There are a few changes required to 3 files (src/file.c, src/finfo.c
+and src/update.c) in the fossil tree.  These are currently in the
+fossil repository in the "venks-emacs" branch.  In the fossil source
+checkout do this:
+
+
+% fossil update venks-emacs
+% make
+
+  
+That builds you a fossil executable which can be used by this
+emacs elisp package
+
+What emacs keys do I need?
+
+This integrates fossil into emacs vc builtin mode.  The same keys will
+work for fossil inside a fossil tree as for other scms outside.
+
+A few are:
+
+
+C-x v dRun Fossil dired - like 
cvs-examine
+C-x v lWhen in a file, show log
+vIn VC, do next action: 
merge/update/checkin
+
+
+

[nongnu] elpa/vc-fossil 82fd031 003/111: Initial Doc

[ELPA Syncer]

branch: elpa/vc-fossil
commit 82fd031e20610929a874e8edb3c71668f630d69d
Author: venkat 
Commit: venkat 

Initial Doc
---
 doc/index.wiki | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/doc/index.wiki b/doc/index.wiki
new file mode 100644
index 000..e77a5c9
--- /dev/null
+++ b/doc/index.wiki
@@ -0,0 +1,31 @@
+Emacs Integration for Fossil
+
+This mini-project is for integrating emacs into fossil.  This needs a
+few changes into fossil and needs a new file to be loaded into emacs.
+
+How Do I load Fossil support into emacs?
+
+Short answer:
+
+Add this to your .emacs file, or cut and paste this into *scratch* buffer and 
do
+C-x e to execute it.   
+
+
+(setq vc-handled-backends '(CVS Fossil))
+(load-file "/path/to/this/project/vc/el/vc-fossil.el")
+
+
+What emacs keys do I need?
+
+This integrates fossil into emacs vc builtin mode.  The same keys will
+work for fossil inside a fossil tree as for other scms outside.
+
+A few are:
+
+
+C-x v dRun Fossil dired - like 
cvs-examine
+C-x v lWhen in a file, show log
+vIn VC, do next action: 
merge/update/checkin
+
+
+

[nongnu] elpa/vc-fossil 15d0461 009/111: Remove --brief from file log. Still used in next-rev/prev-rev.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 15d04619fbab565064d834a1e4cb94e716341c72
Author: venkat 
Commit: venkat 

Remove --brief from file log.  Still used in next-rev/prev-rev.
---
 vc/el/vc-fossil.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 74d372e..8c3ecfc 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -225,7 +225,7 @@
   "Print full log for a file"
   (if files 
   (progn
-   (vc-fossil-command buffer 0 (car files) "finfo" "-l" "-b")
+   (vc-fossil-command buffer 0 (car files) "finfo" "-l")
(vc-fossil-print-log (cdr files) buffer
 
 ;; TBD: log-entry 

[nongnu] elpa/vc-fossil f29eee9 013/111: Revert previous checkin. Remove debug message. Make

[ELPA Syncer]

branch: elpa/vc-fossil
commit f29eee9cf3aa76b9170473e001169c02313caaf9
Author: venkat 
Commit: venkat 

Revert previous checkin.  Remove debug message.  Make
vc-fossil-registered work with files outside fossil trees.
---
 vc/el/vc-fossil.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 0cce07e..20e49a2 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -86,6 +86,7 @@
 (vc-fossil--out-ok "finfo" "-s" (file-truename file))
 (buffer-string
   (and str
+  (> (length str) 7)
   (not (string= (substring str 0 7) "unknown"))
 
 (defun vc-fossil-state-code (code)

[nongnu] elpa/vc-fossil 9856860 021/111: appropriate autoload, and consistent "add fossil" expression in docs

[ELPA Syncer]

branch: elpa/vc-fossil
commit 9856860c56c786bd99f9b22d52fd06cbe801d17d
Author: barak 
Commit: barak 

appropriate autoload, and consistent "add fossil" expression in docs
---
 doc/index.wiki | 3 +--
 vc/el/vc-fossil.el | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/index.wiki b/doc/index.wiki
index f8aa82f..dd6d9d5 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -14,8 +14,7 @@ Add this to your .emacs file, or cut and paste this into 
*scratch* buffer and do
 C-x e to execute it.   
 
 
-(unless (memq 'Fossil vc-handled-backends)
-  (push 'Fossil vc-handled-backends))
+(add-to-list 'vc-handled-backends 'Fossil)
 (load-file "/path/to/this/project/vc/el/vc-fossil.el")
 
 
diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index ac2e344..3a14868 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -80,6 +80,7 @@
 
 ;;; STATE-QUERYING FUNCTIONS
 
+;;;###autoload
 (defun vc-fossil-registered (file)
   "Check whether FILE is registered with fossil."
   (with-temp-buffer

[nongnu] elpa/vc-fossil ac53c94 007/111: Add emacs 23.1 as a requirement in the documenation.

[ELPA Syncer]

branch: elpa/vc-fossil
commit ac53c94c5026afe1f4b2e8cfdef1ddf895dbd075
Author: venkat 
Commit: venkat 

Add emacs 23.1 as a requirement in the documenation.
---
 doc/index.wiki | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/index.wiki b/doc/index.wiki
index 2d035ae..00d6bab 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -3,6 +3,9 @@
 This mini-project is for integrating emacs into fossil.  This needs a
 few changes into fossil and needs a new file to be loaded into emacs.
 
+You need emacs version 23.1 or better.  This definitely does not work
+with versions 22.*.
+
 How Do I load Fossil support into emacs?
 
 Short answer:

[nongnu] elpa/vc-fossil 6e33fff 005/111: Change documentation to reflect new venks-emacs thread.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 6e33fffe856c5d6143661e3a38c883bcd70777e0
Author: venkat 
Commit: venkat 

Change documentation to reflect new venks-emacs thread.
---
 doc/index.wiki | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/doc/index.wiki b/doc/index.wiki
index e77a5c9..c113acc 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -15,6 +15,20 @@ Add this to your .emacs file, or cut and paste this into 
*scratch* buffer and do
 (load-file "/path/to/this/project/vc/el/vc-fossil.el")
 
 
+What changes to fossil are required
+
+There are a few changes required to 3 files (src/file.c, src/finfo.c
+and src/update.c) in the fossil tree.  These are currently in the
+fossil repository in the "venks-emacs" branch.  In the fossil source
+checkout do this:
+
+
+% fossil update venks-emacs
+% make
+  
+That builds you a fossil executable which can be used by this
+emacs elisp package
+
 What emacs keys do I need?
 
 This integrates fossil into emacs vc builtin mode.  The same keys will

[nongnu] elpa/vc-fossil 43f9868 014/111: Add "ADD" as a possible state reported by fossil - also mapped to needs-update

[ELPA Syncer]

branch: elpa/vc-fossil
commit 43f986886e3a66b2bc77757eaf83ddde6995701e
Author: venkat 
Commit: venkat 

Add "ADD" as a possible state reported by fossil - also mapped to 
needs-update
---
 vc/el/vc-fossil.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 20e49a2..e9d7e49 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -97,6 +97,7 @@
  ((string= code "UNCHANGED") 'up-to-date)
  ((string= code "CONFLICT")  'edited)
  ((string= code "ADDED") 'added)
+ ((string= code "ADD")   'needs-update)
  ((string= code "EDITED")'edited)
  ((string= code "REMOVE")'removed)
  ((string= code "UPDATE")'needs-update)

[nongnu] elpa/vc-fossil cb4cd3f 017/111: Fossil version 3af6cf0993, moves update to end, simplifying our parsing.

[ELPA Syncer]

branch: elpa/vc-fossil
commit cb4cd3f1bb315368ed6a31263bbb7a1db18faa6e
Author: venkat 
Commit: venkat 

Fossil version 3af6cf0993, moves update to end, simplifying our parsing.
---
 vc/el/vc-fossil.el | 27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index e1013b5..78f42d2 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -109,14 +109,9 @@
 (defun vc-fossil-state  (file) 
   "Fossil specific version of `vc-state'."
   ; (message (format "vc-fossil-state on %s" file))
-  (with-temp-buffer
-(insert (vc-fossil--run "update" "-n" "-v" "current" file))
-(goto-char (point-max))
-(forward-line -1)
-(vc-fossil-state-code 
- (car 
-  (split-string 
-   (buffer-substring-no-properties (point) (buffer-end 1)))
+  (let ((line (vc-fossil--run "update" "-n" "-v" "current" file)))
+(and line
+(vc-fossil-state-code (car (split-string line))
 
 (defun vc-fossil-working-revision (file)
   "Fossil Specific version of `vc-working-revision'."
@@ -136,17 +131,18 @@
   ;(message dir)
   (insert (vc-fossil--run "update" "-n" "-v" "current" dir))
   (let* ((result)
+(done nil)
 (root (vc-fossil-root dir)))
 (goto-char (point-min))
-(while (not (eobp))
+(while (and (not (eobp)) (not done))
   (setq line (buffer-substring-no-properties (point) (line-end-position)))
   (setq status-word (car (split-string line)))
-  (setq file (substring line (+ (length status-word) 1)))
+  (setq done (string-match "-" status-word))
+  (setq file (if done "." (substring line (+ (length status-word) 1
   (setq file (expand-file-name file root))
   (setq file (file-relative-name file dir))
-  (setq result (if (or (string-match ":" line)
-  (string-match "^[ \t]" line)) result
-  (cons (list file (vc-fossil-state-code status-word)) 
result)))
+  (setq result (if done result
+(cons (list file (vc-fossil-state-code status-word)) 
result)))
   (forward-line))
 (funcall update-function result nil)))
 
@@ -221,7 +217,10 @@
 
 ;; HISTORY FUNCTIONS
 
-(defun vc-fossil-print-log (files &optional buffer)
+;; FIXME, we actually already have short, start and limit, need to
+;; add it into the code
+
+(defun vc-fossil-print-log (files buffer &optional shortlog start-revision 
limit)
   "Print full log for a file"
   (if files 
   (progn

[nongnu] elpa/vc-fossil a6f36f1 008/111: 2 edited files have already merged into fossil trunk. Only one file needs changes - note that.

[ELPA Syncer]

branch: elpa/vc-fossil
commit a6f36f1ae7845c1f7f5ee68ff7d1e1bc1997d206
Author: venkat 
Commit: venkat 

2 edited files have already merged into fossil trunk.  Only one file needs 
changes - note that.
---
 doc/index.wiki | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/index.wiki b/doc/index.wiki
index 00d6bab..837b330 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -20,10 +20,9 @@ Add this to your .emacs file, or cut and paste this into 
*scratch* buffer and do
 
 What changes to fossil are required
 
-There are a few changes required to 3 files (src/file.c, src/finfo.c
-and src/update.c) in the fossil tree.  These are currently in the
-fossil repository in the "venks-emacs" branch.  In the fossil source
-checkout do this:
+There are a few changes required to 1 file (src/file.c) in the fossil
+tree.  These are currently in the main fossil repository in the
+"venks-emacs" branch.  In the fossil source checkout do this:
 
 
 % fossil update venks-emacs

[nongnu] elpa/vc-fossil fe3e0d3 035/111: Enable vc-ediff to work. Thanks to folks who contributed in [8521322bc9]

[ELPA Syncer]

branch: elpa/vc-fossil
commit fe3e0d3e842c7b2814f1ec05a553bf89f4772284
Author: venkat 
Commit: venkat 

Enable vc-ediff to work.  Thanks to folks who contributed in [8521322bc9]
---
 vc/el/vc-fossil.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 355b6bc..b26303e 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -203,7 +203,7 @@
 
 (defun vc-fossil-find-revision (file rev buffer)
   (apply #'vc-fossil-command buffer 0 file
-"finfo" `(,@(if (string= rev "")
+"finfo" `(,@(if (or (null rev) (string= rev ""))
 '()
   `("-r" ,rev)) "-p")))
 

[nongnu] elpa/vc-fossil d844871 026/111: typo in emacs keystroke in documentation

[ELPA Syncer]

branch: elpa/vc-fossil
commit d844871e26f4c56c8374b1be7626f95b4bebd1f2
Author: barak 
Commit: barak 

typo in emacs keystroke in documentation
---
 doc/index.wiki | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/index.wiki b/doc/index.wiki
index ab04679..ad6c3d5 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -10,8 +10,9 @@ with versions 22.*.
 
 Short answer:
 
-Add this to your .emacs file, or cut and paste this into *scratch* buffer and 
do
-C-x e to execute it.   
+Add this to your .emacs file, or cut and paste this into the *scratch*
+buffer and do
+C-x C-e to execute it.
 
 
 (add-to-list 'vc-handled-backends 'Fossil)

[nongnu] elpa/vc-fossil b1429cb 019/111: flush assignment warnings via let augmentation

[ELPA Syncer]

branch: elpa/vc-fossil
commit b1429cbb274d934deaad9b3a1c4b59b68ce4df0c
Author: barak 
Commit: barak 

flush assignment warnings via let augmentation
---
 vc/el/vc-fossil.el | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index c550f32..ac2e344 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -132,7 +132,8 @@
   (insert (vc-fossil--run "update" "-n" "-v" "current" dir))
   (let* ((result)
 (done nil)
-(root (vc-fossil-root dir)))
+(root (vc-fossil-root dir))
+line status-word file)
 (goto-char (point-min))
 (while (and (not (eobp)) (not done))
   (setq line (buffer-substring-no-properties (point) (line-end-position)))
@@ -149,7 +150,7 @@
 (defun vc-fossil-after-dir-status (callback)
   "Function to call after the status process has finished"
   (message "after-dir-status called %s" (buffer-string))
-  (let (result)
+  (let (result line state status-word file)
 (goto-char (point-min))
 (while (not (eobp))
   (setq line (buffer-substring-no-properties (point) (line-end-position)))
@@ -267,7 +268,8 @@
   (if file
   (with-temp-buffer 
(let* ((found (not rev))
-  (newver nil))
+  (newver nil)
+  line version)
  (insert (vc-fossil--run "finfo" "-l" "-b" file))
;(vc-fossil--call "fossil" "finfo" "-l" 
"-b" file)
  (goto-char (point-min))
@@ -285,7 +287,8 @@
   (if file
   (with-temp-buffer 
(let* ((found (not rev))
-  (oldver nil))
+  (oldver nil)
+  line version)
  (insert (vc-fossil--run "finfo" "-l" "-b" file))
;(vc-fossil--call "fossil" "finfo" "-l" 
"-b" file)
  (goto-char (point-min))

[nongnu] elpa/vc-fossil 0bd29ae 010/111: Simplified version of vc-fossil-registered.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 0bd29aec05cdf1fc81ada064900519a13b79e071
Author: venkat 
Commit: venkat 

Simplified version of vc-fossil-registered.
---
 vc/el/vc-fossil.el | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 8c3ecfc..9f7486e 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -81,16 +81,12 @@
 
 (defun vc-fossil-registered (file)
   "Check whether FILE is registered with fossil."
-  (when (vc-fossil-root file)
-(with-temp-buffer
-  (let* ((dir (file-name-directory file))
-(name (file-relative-name file dir))
-(str (ignore-errors
-   (when dir (cd dir))
-   (vc-fossil--out-ok "finfo" "-s" name)
-   (buffer-string
-(and str
-   (not (string= (substring str 0 7) "unknown")))
+  (with-temp-buffer
+(let* ((str (ignore-errors
+(vc-fossil--out-ok "finfo" "-s" (file-truename file))
+(message (buffer-string)
+  (and str
+  (not (string= (substring str 0 7) "unknown"))
 
 (defun vc-fossil-state-code (code)
   (if (not code)

[nongnu] elpa/vc-fossil 9d2d9f8 038/111: Refactoring of `vc-fossil-dir-status`.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 9d2d9f8664a7125d6d250ebfd1210d08a6cd9286
Author: fifr 
Commit: fifr 

Refactoring of `vc-fossil-dir-status`.
---
 vc/el/vc-fossil.el | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index e70ec94..974f447 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -126,21 +126,21 @@
   "Get Fossil status for all files in a directory"
   (insert (vc-fossil--run "update" "-n" "-v" "current" dir))
   (let ((result '())
-(done nil)
 (root (vc-fossil-root dir)))
 (goto-char (point-min))
-(while (and (not (eobp)) (not done))
-  (let* ((line (buffer-substring-no-properties (point) 
(line-end-position)))
+(while (not (eobp))
+  (let* ((line (buffer-substring-no-properties
+(point)
+(progn
+  (forward-line)
+  (point
  (status-word (car (split-string line
-(setq done (string-match "-" status-word))
-(unless done
+(if (string-match "-" status-word)
+(goto-char (point-max))
   (let ((file (substring line (+ (length status-word) 1
-(let ((file (expand-file-name file root)))
-  (let ((file (file-relative-name file dir)))
-(setq result
-  (cons (list file (vc-fossil-state-code status-word))
-result)))
-  (forward-line))
+(setq file (expand-file-name file root))
+(setq file (file-relative-name file dir))
+(push (list file (vc-fossil-state-code status-word)) result)
 (funcall update-function result nil)))
 
 (defun vc-fossil-after-dir-status (callback)

[nongnu] elpa/vc-fossil c1585fc 040/111: Remove `vc-fossil-after-dir-status`.

[ELPA Syncer]

branch: elpa/vc-fossil
commit c1585fcb08a4233a92d87fda9c9c2ab0edb98ff7
Author: fifr 
Commit: fifr 

Remove `vc-fossil-after-dir-status`.
---
 vc/el/vc-fossil.el | 14 --
 1 file changed, 14 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 0958c80..f53d5e6 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -143,20 +143,6 @@
 (push (list file (vc-fossil-state-code status-word)) result)
 (funcall update-function result nil)))
 
-(defun vc-fossil-after-dir-status (callback)
-  "Function to call after the status process has finished"
-  (let ((result '()))
-(goto-char (point-min))
-(while (not (eobp))
-  (let ((line (buffer-substring-no-properties (point) (line-end-position)))
-(status-word '()))
-(message line)
-(let* ((state (vc-fossil-state-code (car (split-string line
-   (file (expand-file-name (substring line (+ (length status-word) 
1)
-  (setq result (cons (list file state) result
-  (forward-line))
-(funcall callback result t)))
-
 (defun vc-fossil-checkout-model (files) 'implicit)
 
 (defun vc-fossil-dir-extra-headers (dir)

[nongnu] elpa/vc-fossil 56b4562 020/111: tweak doc: compile command, and don't smash other VCs off vc-handled-backends

[ELPA Syncer]

branch: elpa/vc-fossil
commit 56b456291282864f8b07858b3a08899f4a8b96c4
Author: barak 
Commit: barak 

tweak doc: compile command, and don't smash other VCs off 
vc-handled-backends
---
 doc/index.wiki | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/index.wiki b/doc/index.wiki
index 4b24a22..f8aa82f 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -14,10 +14,17 @@ Add this to your .emacs file, or cut and paste this into 
*scratch* buffer and do
 C-x e to execute it.   
 
 
-(setq vc-handled-backends '(CVS Fossil))
+(unless (memq 'Fossil vc-handled-backends)
+  (push 'Fossil vc-handled-backends))
 (load-file "/path/to/this/project/vc/el/vc-fossil.el")
 
 
+To compile the file (with warnings) do the following
+
+emacs -batch -q -no-site-file -eval '(byte-compile-file "vc-fossil.el")'
+
+then you can load vc-fossil.elc, which should be nominally faster.
+
 What changes to fossil are required
 
 As of this fossil version:

[nongnu] elpa/vc-fossil 419877b 030/111: squelch dead computation; clarify logic

[ELPA Syncer]

branch: elpa/vc-fossil
commit 419877b96c573a0d82118b97ebf24001e0b8c6b3
Author: barak 
Commit: barak 

squelch dead computation; clarify logic
---
 vc/el/vc-fossil.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 334002d..4ca96da 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -136,10 +136,10 @@
   (let* ((line (buffer-substring-no-properties (point) 
(line-end-position)))
 (status-word (car (split-string line
(setq done (string-match "-" status-word))
-   (let ((file (if done "." (substring line (+ (length status-word) 1)
- (let ((file (expand-file-name file root)))
-   (let ((file (file-relative-name file dir)))
- (unless done
+   (unless done
+ (let ((file (substring line (+ (length status-word) 1
+   (let ((file (expand-file-name file root)))
+ (let ((file (file-relative-name file dir)))
(setq result
  (cons (list file (vc-fossil-state-code status-word))
result)))

[nongnu] elpa/vc-fossil 70efbef 011/111: Note that fossil trunk now has all required changes.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 70efbef407cc016d714d0f0f990fdb9d76fd2a6c
Author: venkat 
Commit: venkat 

Note that fossil trunk now has all required changes.
---
 doc/index.wiki | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/index.wiki b/doc/index.wiki
index 837b330..4b24a22 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -20,17 +20,18 @@ Add this to your .emacs file, or cut and paste this into 
*scratch* buffer and do
 
 What changes to fossil are required
 
-There are a few changes required to 1 file (src/file.c) in the fossil
-tree.  These are currently in the main fossil repository in the
-"venks-emacs" branch.  In the fossil source checkout do this:
+As of this fossil version:
 
 
-% fossil update venks-emacs
-% make
+7d2d1d3228232b1a1434e425f11008c043171263 2010-11-09 17:51:35 UTC
 
-  
-That builds you a fossil executable which can be used by this
-emacs elisp package
+
+Fossil trunk (and therefore binaries after that date) support
+this package directly.
+
+Future changes, if required, will be in the venks-emacs branch on the
+fossil repository.
+
 
 What emacs keys do I need?
 

[nongnu] elpa/vc-fossil 5a8e1a3 022/111: autoload in docs

[ELPA Syncer]

branch: elpa/vc-fossil
commit 5a8e1a36c24b3127a7cab7c4187588ad5c459432
Author: barak 
Commit: barak 

autoload in docs
---
 doc/index.wiki | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/doc/index.wiki b/doc/index.wiki
index dd6d9d5..ab04679 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -17,6 +17,12 @@ Add this to your .emacs file, or cut and paste this into 
*scratch* buffer and do
 (add-to-list 'vc-handled-backends 'Fossil)
 (load-file "/path/to/this/project/vc/el/vc-fossil.el")
 
+or if you would rather load the file lazily, compile the file (see
+below) and use this instead.
+
+(add-to-list 'vc-handled-backends 'Fossil)
+(autoload 'vc-fossil-registered "/path/to/this/project/vc/el/vc-fossil.elc")
+
 
 To compile the file (with warnings) do the following
 

[nongnu] elpa/vc-fossil 086622b 015/111: Handle headers in update -n -v (currently ignore any line with a :).

[ELPA Syncer]

branch: elpa/vc-fossil
commit 086622b1a3a03de5e27daed640082da6eac47260
Author: venkat 
Commit: venkat 

Handle headers in update -n -v (currently ignore any line with a :).
---
 vc/el/vc-fossil.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index e9d7e49..1dbe03e 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -137,14 +137,15 @@
   (setq line (buffer-substring-no-properties (point) (line-end-position)))
   ;(message line)
   (setq status-word (car (split-string line)))
-  (setq state (vc-fossil-state-code status-word))
   (setq file (substring line (+ (length status-word) 1)))
   ;(message file)
   (setq file (expand-file-name file root))
   ;(message file)
   (setq file (file-relative-name file dir))
   ;(message file)
-  (setq result (cons (list file state) result))
+  (setq result 
+   (if (string-match ":" line) result 
+ (cons (list file (vc-fossil-state-code status-word)) result)))
   (forward-line))
 (funcall update-function result nil)))
 

[nongnu] elpa/vc-fossil 0497f8f 037/111: Remove some old debug messages.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 0497f8f06b5cb93b213abc9337e945e185c66315
Author: fifr 
Commit: fifr 

Remove some old debug messages.
---
 vc/el/vc-fossil.el | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index c5f03d7..e70ec94 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -91,7 +91,7 @@
(not (string= (substring str 0 7) "unknown"))
 
 (defun vc-fossil-state-code (code)
-  (cond ((not code) 'unregistered)
+  (cond ((not code) 'unregistered)
 ((string= code "UNKNOWN")   'unregistered)
 ((string= code "UNCHANGED") 'up-to-date)
 ((string= code "CONFLICT")  'edited)
@@ -103,11 +103,8 @@
 ((string= code "MERGE") 'needs-merge)
 (t   nil)))
 
-;; (vc-fossil-state 
"/proj/fiesta/tools/fossil/emacs-fossil/vc/el/vc-fossil.el")
-
 (defun vc-fossil-state  (file)
   "Fossil specific version of `vc-state'."
-  ;; (message (format "vc-fossil-state on %s %s" file (file-truename file)))
   (let ((line (vc-fossil--run "update" "-n" "-v" "current" (file-truename 
file
 (and line
  (vc-fossil-state-code (car (split-string line))
@@ -127,7 +124,6 @@
 
 (defun vc-fossil-dir-status (dir update-function)
   "Get Fossil status for all files in a directory"
-  ;; (message dir)
   (insert (vc-fossil--run "update" "-n" "-v" "current" dir))
   (let ((result '())
 (done nil)
@@ -231,7 +227,6 @@
 
 (defun vc-fossil-diff (file &optional rev1 rev2 buffer)
   "Get Differences for a file"
-  ;; (message (format "Get diffs between rev <%s> and <%s> for file <%s>" rev1 
rev2 file))
   (let ((buf (or buffer "*vc-diff*")))
 (apply #'vc-fossil-command
buf 0 file "diff" "-i"
@@ -271,7 +266,6 @@
 (while (not (eobp))
   (let* ((line (buffer-substring-no-properties (point) 
(line-end-position)))
  (version (car (split-string line
-;; (message line)
 (setq newver (or newver (and found version)))
 (setq found  (string= version rev)))
   (forward-line))

[nongnu] elpa/vc-fossil 3c8fae8 016/111: Mulitple changes to allow 23.2 integration and to fix fossil-state-code incorrectly still using --file to update -n -v

[ELPA Syncer]

branch: elpa/vc-fossil
commit 3c8fae87b98b723fe344b790655390f93005cb64
Author: venkat 
Commit: venkat 

Mulitple changes to allow 23.2 integration and to fix fossil-state-code 
incorrectly still using --file to update -n -v
---
 vc/el/vc-fossil.el | 51 ++-
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 1dbe03e..e1013b5 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -13,6 +13,7 @@
 ;; to the list of supported backends in `vc-handled-backends'
 ;;
 ;; e.g.(add-to-list 'vc-handled-backends 'Fossil)
+;; or  (setq vc-handled-backends '(CVS Fossil))
 
 ;;; Implemented Functions
 ;; BACKEND PROPERTIES
@@ -92,26 +93,30 @@
 (defun vc-fossil-state-code (code)
   (if (not code)
   'unregistered
-(let ((state (cond 
- ((string= code "UNKNOWN")   'unregistered)
- ((string= code "UNCHANGED") 'up-to-date)
- ((string= code "CONFLICT")  'edited)
- ((string= code "ADDED") 'added)
- ((string= code "ADD")   'needs-update)
- ((string= code "EDITED")'edited)
- ((string= code "REMOVE")'removed)
- ((string= code "UPDATE")'needs-update)
- ((string= code "MERGE") 'needs-merge
-  (if state state
-   (error "Cannot handle fossil state code %s" code)
-
-
-(defun vc-fossil-state  (file)
+(cond 
+ ((string= code "UNKNOWN")   'unregistered)
+ ((string= code "UNCHANGED") 'up-to-date)
+ ((string= code "CONFLICT")  'edited)
+ ((string= code "ADDED") 'added)
+ ((string= code "ADD")   'needs-update)
+ ((string= code "EDITED")'edited)
+ ((string= code "REMOVE")'removed)
+ ((string= code "UPDATE")'needs-update)
+ ((string= code "MERGE") 'needs-merge
+
+; (vc-fossil-state "/proj/fiesta/tools/fossil/emacs-fossil/vc/el/vc-fossil.el")
+
+(defun vc-fossil-state  (file) 
   "Fossil specific version of `vc-state'."
   ; (message (format "vc-fossil-state on %s" file))
-  (let ((line (vc-fossil--run "update" "-n" "-v" "--file" file)))
-(and line
-(vc-fossil-state-code (car (split-string line))
+  (with-temp-buffer
+(insert (vc-fossil--run "update" "-n" "-v" "current" file))
+(goto-char (point-max))
+(forward-line -1)
+(vc-fossil-state-code 
+ (car 
+  (split-string 
+   (buffer-substring-no-properties (point) (buffer-end 1)))
 
 (defun vc-fossil-working-revision (file)
   "Fossil Specific version of `vc-working-revision'."
@@ -135,17 +140,13 @@
 (goto-char (point-min))
 (while (not (eobp))
   (setq line (buffer-substring-no-properties (point) (line-end-position)))
-  ;(message line)
   (setq status-word (car (split-string line)))
   (setq file (substring line (+ (length status-word) 1)))
-  ;(message file)
   (setq file (expand-file-name file root))
-  ;(message file)
   (setq file (file-relative-name file dir))
-  ;(message file)
-  (setq result 
-   (if (string-match ":" line) result 
- (cons (list file (vc-fossil-state-code status-word)) result)))
+  (setq result (if (or (string-match ":" line)
+  (string-match "^[ \t]" line)) result
+  (cons (list file (vc-fossil-state-code status-word)) 
result)))
   (forward-line))
 (funcall update-function result nil)))
 

[nongnu] elpa/vc-fossil c642a01 042/111: Pass `vc-checkin-switches` on checkin.

[ELPA Syncer]

branch: elpa/vc-fossil
commit c642a014d87058feac5b8202f5dde2476c1feb46
Author: fifr 
Commit: fifr 

Pass `vc-checkin-switches` on checkin.

This is required by the VC interface.
---
 vc/el/vc-fossil.el | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index db27336..c7ed4cc 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -193,7 +193,10 @@ If `files` is nil return the status for all files."
 
 
 (defun vc-fossil-checkin (files rev comment)
-  (vc-fossil-command nil 0 files "commit" "-m" comment))
+  (apply 'vc-fossil-command nil 0 files "commit" "-m" comment
+ (if (stringp vc-checkin-switches)
+ (list vc-checkin-switches)
+   vc-checkin-switches)))
 
 (defun vc-fossil-find-revision (file rev buffer)
   (apply #'vc-fossil-command buffer 0 file

[nongnu] elpa/vc-fossil 0da61d3 025/111: standard comment style

[ELPA Syncer]

branch: elpa/vc-fossil
commit 0da61d3538fa642359672bb8e937d208e742c428
Author: barak 
Commit: barak 

standard comment style
---
 vc/el/vc-fossil.el | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 3304de0..5928657 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -103,11 +103,11 @@
((string= code "MERGE") 'needs-merge)
(t  nil)))
 
-; (vc-fossil-state "/proj/fiesta/tools/fossil/emacs-fossil/vc/el/vc-fossil.el")
+;; (vc-fossil-state 
"/proj/fiesta/tools/fossil/emacs-fossil/vc/el/vc-fossil.el")
 
 (defun vc-fossil-state  (file)
   "Fossil specific version of `vc-state'."
-  ; (message (format "vc-fossil-state on %s" file))
+  ;; (message (format "vc-fossil-state on %s" file))
   (let ((line (vc-fossil--run "update" "-n" "-v" "current" file)))
 (and line
 (vc-fossil-state-code (car (split-string line))
@@ -127,7 +127,7 @@
 
 (defun vc-fossil-dir-status (dir update-function)
   "Get Fossil status for all files in a directory"
-  ;(message dir)
+  ;; (message dir)
   (insert (vc-fossil--run "update" "-n" "-v" "current" dir))
   (let* ((result)
 (done nil)
@@ -266,11 +266,11 @@
 (newver nil)
 line version)
(insert (vc-fossil--run "finfo" "-l" "-b" file))
-   ;(vc-fossil--call "fossil" "finfo" "-l" 
"-b" file)
+   ;; (vc-fossil--call "fossil" "finfo" "-l" "-b" file)
(goto-char (point-min))
(while (not (eobp))
  (setq line (buffer-substring-no-properties (point) 
(line-end-position)))
-   ;(message line)
+ ;; (message line)
  (setq version (car (split-string line)))
  (setq newver (or newver (and found version)))
  (setq found  (string= version rev))
@@ -285,7 +285,7 @@
 (oldver nil)
 line version)
(insert (vc-fossil--run "finfo" "-l" "-b" file))
-   ;(vc-fossil--call "fossil" "finfo" "-l" 
"-b" file)
+   ;; (vc-fossil--call "fossil" "finfo" "-l" "-b" file)
(goto-char (point-min))
(while (not (eobp))
  (setq line (buffer-substring-no-properties (point) 
(line-end-position)))

[nongnu] elpa/vc-fossil 0921094 023/111: whitespace and fiddle with a instructions comment

[ELPA Syncer]

branch: elpa/vc-fossil
commit 0921094c0e3a9db92a608ba4040cea969185a699
Author: barak 
Commit: barak 

whitespace and fiddle with a instructions comment
---
 vc/el/vc-fossil.el | 55 +++---
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 3a14868..ac83798 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -5,22 +5,21 @@
 
 ;; This file contains a VC backend for the fossil version control
 ;; system.
-;;
 
 ;;; Installation:
 
-;; 1. Put this file somewhere in the emacs load-path.  2. Add Fossil
-;; to the list of supported backends in `vc-handled-backends'
-;;
-;; e.g.(add-to-list 'vc-handled-backends 'Fossil)
-;; or  (setq vc-handled-backends '(CVS Fossil))
+;; 1. Put this file somewhere in the emacs load-path.
+;; 2. Tell Emacs to load it when needed:
+;;(autoload 'vc-fossil-registered "vc-fossil")
+;; 3. Add Fossil to the list of supported backends:
+;;(add-to-list 'vc-handled-backends 'Fossil)
 
 ;;; Implemented Functions
 ;; BACKEND PROPERTIES
 ;; * revision-granularity
 ;; STATE-QUERYING FUNCTIONS
-;; * registered (file)   
-;; * state (file) - 'up-to-date 'edited 'needs-patch 'needs-merge 
+;; * registered (file)
+;; * state (file) - 'up-to-date 'edited 'needs-patch 'needs-merge
 ;; * workfile-version (file)
 ;; * checkout-model (file)
 ;; - workfile-unchanged-p (file)
@@ -56,10 +55,10 @@
 (defun vc-fossil--run (&rest args)
   "Run a fossil command and return its output as a string"
   (let* ((ok t)
- (str (with-output-to-string
-(with-current-buffer standard-output
-  (unless (apply 'vc-fossil--out-ok args)
-(setq ok nil))
+(str (with-output-to-string
+   (with-current-buffer standard-output
+ (unless (apply 'vc-fossil--out-ok args)
+   (setq ok nil))
 (and ok str)))
 
 (defun vc-fossil-root (file)
@@ -85,8 +84,8 @@
   "Check whether FILE is registered with fossil."
   (with-temp-buffer
 (let* ((str (ignore-errors
-(vc-fossil--out-ok "finfo" "-s" (file-truename file))
-(buffer-string
+ (vc-fossil--out-ok "finfo" "-s" (file-truename file))
+ (buffer-string
   (and str
   (> (length str) 7)
   (not (string= (substring str 0 7) "unknown"))
@@ -94,7 +93,7 @@
 (defun vc-fossil-state-code (code)
   (if (not code)
   'unregistered
-(cond 
+(cond
  ((string= code "UNKNOWN")   'unregistered)
  ((string= code "UNCHANGED") 'up-to-date)
  ((string= code "CONFLICT")  'edited)
@@ -107,7 +106,7 @@
 
 ; (vc-fossil-state "/proj/fiesta/tools/fossil/emacs-fossil/vc/el/vc-fossil.el")
 
-(defun vc-fossil-state  (file) 
+(defun vc-fossil-state  (file)
   "Fossil specific version of `vc-state'."
   ; (message (format "vc-fossil-state on %s" file))
   (let ((line (vc-fossil--run "update" "-n" "-v" "current" file)))
@@ -168,7 +167,7 @@
   (let* ((info (vc-fossil--run "info"))
 (posco (string-match "checkout: *\\([0-9a-fA-F]+\\) \\([-0-9: ]+ 
UTC\\)" info))
 (coid (substring (match-string 1 info) 0 9))
-(cots (format-time-string "%Y-%m-%d %H:%M:%S %Z" 
+(cots (format-time-string "%Y-%m-%d %H:%M:%S %Z"
   (safe-date-to-time (match-string 2 info
 (postag (string-match "tags: *\\(.*\\)" info))
 (tags (match-string 1 info))
@@ -204,7 +203,7 @@
 (defun vc-fossil-find-revision (file rev buffer)
   (if (string= rev "")
   (vc-fossil-command buffer 0 file "finfo" "-p")
-  (vc-fossil-command buffer 0 file "finfo" "-r" rev "-p")))
+(vc-fossil-command buffer 0 file "finfo" "-r" rev "-p")))
 
 (defun vc-fossil-checkout (file &optional editable rev)
   (cond ((eq rev t)
@@ -224,12 +223,12 @@
 
 (defun vc-fossil-print-log (files buffer &optional shortlog start-revision 
limit)
   "Print full log for a file"
-  (if files 
+  (if files
   (progn
-   (vc-fossil-command buffer 0 (car files) "finfo" "-l")
-   (vc-fossil-print-log (cdr files) buffer
-
-;; TBD: log-entry 
+   (vc-fossil-command buffer 0 (car files) "finfo" "-l")
+   (vc-fossil-print-log (cdr files) buffer
+
+;; TBD: log-entry
 
 (defun vc-fossil-diff (file &optional rev1 rev2 buffer)
   "Get Differences for a file"
@@ -261,18 +260,18 @@
 (defun vc-fossil-retrieve-tag (dir name update)
   (let ((default-directory dir))
 (vc-fossil-command nil 0 nil "checkout" name)))
-
+
 ;;; MISCELLANEOUS
 
 (defun vc-fossil-previous-revision (file rev)
   "Fossil specific version of the `vc-previous-revision'."
   (if file
-  (with-temp-buffer 
+  (with-temp-buffer
(let* ((found (not rev))
   (newver nil)
   line version)
  (insert (vc-fossil--run "finfo" "-l" "-b" file))
-   ;(vc-fossil--call "f

[nongnu] elpa/vc-fossil 1319569 041/111: Show unregistered files in dir stat.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 1319569a50f8da5dfb3257ab6a8cad39621a3caf
Author: fifr 
Commit: fifr 

Show unregistered files in dir stat.

The directory status should list untracked files. This is implemented
by a call to "fossil extras".  Also implements
`vc-fossil-dir-status-files`.
---
 vc/el/vc-fossil.el | 29 +
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index f53d5e6..db27336 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -123,24 +123,37 @@
 
 
 (defun vc-fossil-dir-status (dir update-function)
-  "Get Fossil status for all files in a directory"
-  (insert (vc-fossil--run "update" "-n" "-v" "current" dir))
+  "Get fossil status for all files in a directory"
+  (vc-fossil-dir-status-files dir nil nil update-function))
+
+(defun vc-fossil-dir-status-files (dir files default-state update-function)
+  "Get fossil status for all specified files in a directory.
+If `files` is nil return the status for all files."
+  (insert (apply 'vc-fossil--run "update" "-n" "-v" "current"
+ (or files (list dir
   (let ((result '())
 (root (vc-fossil-root dir)))
 (goto-char (point-min))
 (while (not (eobp))
-  (let* ((line (buffer-substring-no-properties
-(point)
-(progn
-  (forward-line)
-  (point
+  (let* ((line (buffer-substring-no-properties (point) 
(line-end-position)))
  (status-word (car (split-string line
 (if (string-match "-" status-word)
 (goto-char (point-max))
   (let ((file (substring line (+ (length status-word) 1
 (setq file (expand-file-name file root))
 (setq file (file-relative-name file dir))
-(push (list file (vc-fossil-state-code status-word)) result)
+(push (list file (vc-fossil-state-code status-word)) result)))
+(forward-line)))
+;; now collect untracked files
+(delete-region (point-min) (point-max))
+(insert (apply 'vc-fossil--run "extras" "--dotfiles" (or files (list 
dir
+(goto-char (point-min))
+(while (not (eobp))
+  (let ((file (buffer-substring-no-properties (point) 
(line-end-position
+(setq file (expand-file-name file dir))
+(setq file (file-relative-name file dir))
+(push (list file (vc-fossil-state-code nil)) result)
+(forward-line)))
 (funcall update-function result nil)))
 
 (defun vc-fossil-checkout-model (files) 'implicit)

[nongnu] elpa/vc-fossil eeb48f4 024/111: fiddle with some if constructs so I can read this

[ELPA Syncer]

branch: elpa/vc-fossil
commit eeb48f4817d4577e4866daa4a9acfefd9b970a2e
Author: barak 
Commit: barak 

fiddle with some if constructs so I can read this
---
 vc/el/vc-fossil.el | 107 +
 1 file changed, 51 insertions(+), 56 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index ac83798..3304de0 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -91,18 +91,17 @@
   (not (string= (substring str 0 7) "unknown"))
 
 (defun vc-fossil-state-code (code)
-  (if (not code)
-  'unregistered
-(cond
- ((string= code "UNKNOWN")   'unregistered)
- ((string= code "UNCHANGED") 'up-to-date)
- ((string= code "CONFLICT")  'edited)
- ((string= code "ADDED") 'added)
- ((string= code "ADD")   'needs-update)
- ((string= code "EDITED")'edited)
- ((string= code "REMOVE")'removed)
- ((string= code "UPDATE")'needs-update)
- ((string= code "MERGE") 'needs-merge
+  (cond ((not code)'unregistered)
+   ((string= code "UNKNOWN")   'unregistered)
+   ((string= code "UNCHANGED") 'up-to-date)
+   ((string= code "CONFLICT")  'edited)
+   ((string= code "ADDED") 'added)
+   ((string= code "ADD")   'needs-update)
+   ((string= code "EDITED")'edited)
+   ((string= code "REMOVE")'removed)
+   ((string= code "UPDATE")'needs-update)
+   ((string= code "MERGE") 'needs-merge)
+   (t  nil)))
 
 ; (vc-fossil-state "/proj/fiesta/tools/fossil/emacs-fossil/vc/el/vc-fossil.el")
 
@@ -223,25 +222,21 @@
 
 (defun vc-fossil-print-log (files buffer &optional shortlog start-revision 
limit)
   "Print full log for a file"
-  (if files
-  (progn
-   (vc-fossil-command buffer 0 (car files) "finfo" "-l")
-   (vc-fossil-print-log (cdr files) buffer
+  (when files
+(vc-fossil-command buffer 0 (car files) "finfo" "-l")
+(vc-fossil-print-log (cdr files) buffer)))
 
 ;; TBD: log-entry
 
 (defun vc-fossil-diff (file &optional rev1 rev2 buffer)
   "Get Differences for a file"
-  ;(message (format "Get diffs between rev <%s> and <%s> for file <%s>" rev1 
rev2 file))
+  ;; (message (format "Get diffs between rev <%s> and <%s> for file <%s>" rev1 
rev2 file))
   (let ((buf (or buffer "*vc-diff*")))
-(if (and rev1 rev2)
-   (vc-fossil-command buf 0 file "diff" "-i" "--from" rev1 "--to" rev2)
-  (if rev1
- (vc-fossil-command buf 0 file "diff" "-i" "--from" rev1)
-   (if rev2
-   (vc-fossil-command buf 0 file "diff" "-i" "--to" rev2)
- (vc-fossil-command buf 0 file "diff" "-i")
- )
+(cond ((and rev1 rev2)
+  (vc-fossil-command buf 0 file "diff" "-i" "--from" rev1 "--to" rev2))
+ (rev1 (vc-fossil-command buf 0 file "diff" "-i" "--from" rev1))
+ (rev2 (vc-fossil-command buf 0 file "diff" "-i" "--to" rev2))
+ (t (vc-fossil-command buf 0 file "diff" "-i")
 
 ;;; TAG SYSTEM
 
@@ -265,40 +260,40 @@
 
 (defun vc-fossil-previous-revision (file rev)
   "Fossil specific version of the `vc-previous-revision'."
-  (if file
-  (with-temp-buffer
-   (let* ((found (not rev))
-  (newver nil)
-  line version)
- (insert (vc-fossil--run "finfo" "-l" "-b" file))
- ;(vc-fossil--call "fossil" "finfo" "-l" "-b" file)
- (goto-char (point-min))
- (while (not (eobp))
-   (setq line (buffer-substring-no-properties (point) 
(line-end-position)))
-   ;(message line)
-   (setq version (car (split-string line)))
-   (setq newver (or newver (and found version)))
-   (setq found  (string= version rev))
-   (forward-line))
- newver
+  (when file
+(with-temp-buffer
+  (let* ((found (not rev))
+(newver nil)
+line version)
+   (insert (vc-fossil--run "finfo" "-l" "-b" file))
+   ;(vc-fossil--call "fossil" "finfo" "-l" 
"-b" file)
+   (goto-char (point-min))
+   (while (not (eobp))
+ (setq line (buffer-substring-no-properties (point) 
(line-end-position)))
+   ;(message line)
+ (setq version (car (split-string line)))
+ (setq newver (or newver (and found version)))
+ (setq found  (string= version rev))
+ (forward-line))
+   newver
 
 (defun vc-fossil-next-revision (file rev)
   "Fossil specific version of the `vc-previous-revision'."
-  (if file
-  (with-temp-buffer
-   (let* ((found (not rev))
-  (oldver nil)
-  line version)
- (insert (vc-fossil--run "finfo" "-l" "-b" file))
- ;(vc-fossil--call "fossil" "finfo" "-l" "-b" file)
- (goto-char (point-min))
- (while (not (eobp))
-   (setq line (buffer-substring-no-properties (point) 
(line-end-position)))
-   (setq version (car 

[nongnu] elpa/vc-fossil 1d46c62 027/111: eschew some redundancy, and use modern apply syntax

[ELPA Syncer]

branch: elpa/vc-fossil
commit 1d46c622544c520a4b214499e8bf68a29ca86dd2
Author: barak 
Commit: barak 

eschew some redundancy, and use modern apply syntax
---
 vc/el/vc-fossil.el | 39 +++
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 5928657..4c14dda 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -47,17 +47,17 @@
 ;; Internal Commands
 
 (defun vc-fossil--call (buffer &rest args)
-  (apply 'process-file "fossil" nil buffer nil args))
+  (apply #'process-file "fossil" nil buffer nil args))
 
 (defun vc-fossil--out-ok (&rest args)
-  (zerop (apply 'vc-fossil--call '(t nil) args)))
+  (zerop (apply #'vc-fossil--call '(t nil) args)))
 
 (defun vc-fossil--run (&rest args)
   "Run a fossil command and return its output as a string"
   (let* ((ok t)
 (str (with-output-to-string
(with-current-buffer standard-output
- (unless (apply 'vc-fossil--out-ok args)
+ (unless (apply #'vc-fossil--out-ok args)
(setq ok nil))
 (and ok str)))
 
@@ -67,7 +67,7 @@
 (defun vc-fossil-command (buffer okstatus file-or-list &rest flags)
   "A wrapper around `vc-do-command' for use in vc-fossil.el.
   The difference to vc-do-command is that this function always invokes 
`fossil'."
-  (apply 'vc-do-command (or buffer "*vc*") okstatus "fossil" file-or-list 
flags))
+  (apply #'vc-do-command (or buffer "*vc*") okstatus "fossil" file-or-list 
flags))
 
 (defun vc-fossil-get-id (dir)
   (let* ((default-directory dir)
@@ -116,7 +116,7 @@
   "Fossil Specific version of `vc-working-revision'."
   (let ((line (vc-fossil--run "finfo" "-s" file)))
 (and line
-(car (cdr (split-string line))
+(cadr (split-string line)
 
 (defun vc-fossil-workfile-unchanged-p (file)
   (eq 'up-to-date (vc-fossil-state file)))
@@ -200,15 +200,14 @@
   (vc-fossil-command nil 0 files "commit" "-m" comment))
 
 (defun vc-fossil-find-revision (file rev buffer)
-  (if (string= rev "")
-  (vc-fossil-command buffer 0 file "finfo" "-p")
-(vc-fossil-command buffer 0 file "finfo" "-r" rev "-p")))
+  (apply #'vc-fossil-command buffer 0 file
+"finfo" `(,@(if (string= rev "")
+'()
+  `("-r" ,rev)) "-p")))
 
 (defun vc-fossil-checkout (file &optional editable rev)
-  (cond ((eq rev t)
-(vc-fossil-command nil 0 nil "update"))
-   (t
-(vc-fossil-command nil 0 nil "update" rev
+  (apply #'vc-fossil-command nil 0 nil
+"update" `(,@(if (eq rev t) '() `(,rev)
 
 (defun vc-fossil-revert (file &optional contents-done)
   "Revert FILE to the version stored in the fossil repository."
@@ -232,11 +231,10 @@
   "Get Differences for a file"
   ;; (message (format "Get diffs between rev <%s> and <%s> for file <%s>" rev1 
rev2 file))
   (let ((buf (or buffer "*vc-diff*")))
-(cond ((and rev1 rev2)
-  (vc-fossil-command buf 0 file "diff" "-i" "--from" rev1 "--to" rev2))
- (rev1 (vc-fossil-command buf 0 file "diff" "-i" "--from" rev1))
- (rev2 (vc-fossil-command buf 0 file "diff" "-i" "--to" rev2))
- (t (vc-fossil-command buf 0 file "diff" "-i")
+(apply #'vc-fossil-command
+  buf 0 file "diff" "-i"
+  `(,@(if rev1 `("--from" ,rev1) '())
+,@(if rev2 `("--to" ,rev2) '())
 
 ;;; TAG SYSTEM
 
@@ -246,9 +244,10 @@
 (defun vc-fossil-create-tag (file name branchp)
   (let* ((dir (if (file-directory-p file) file (file-name-directory file)))
 (default-directory dir))
-(if branchp
-   (vc-fossil-command nil 0 nil "branch" "new" name (vc-fossil-get-id dir))
-  (vc-fossil-command nil 0 nil "tag" "add" name (vc-fossil-get-id dir)
+(apply #'vc-fossil-command nil 0 nil `(,@(if branchp
+'("branch" "new")
+  '("tag" "add"))
+  ,name ,(vc-fossil-get-id dir)
 
 ;; FIXME: we should update buffers if update is non-nill
 

[nongnu] elpa/vc-fossil 403712d 032/111: Fossil gets confused traversing through symlinks. Use file-truename in multiple places to get past that.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 403712dfee9fee182277f13d0158fe09fedfba6a
Author: venks 
Commit: venks 

Fossil gets confused traversing through symlinks.  Use file-truename in 
multiple places to get past that.
---
 vc/el/vc-fossil.el | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 2a3d2a6..3ce6d12 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -114,7 +114,7 @@
 
 (defun vc-fossil-working-revision (file)
   "Fossil Specific version of `vc-working-revision'."
-  (let ((line (vc-fossil--run "finfo" "-s" file)))
+  (let ((line (vc-fossil--run "finfo" "-s" (file-truename file
 (and line
 (cadr (split-string line)
 
@@ -224,7 +224,7 @@
 (defun vc-fossil-print-log (files buffer &optional shortlog start-revision 
limit)
   "Print full log for a file"
   (when files
-(vc-fossil-command buffer 0 (car files) "finfo" "-l")
+(vc-fossil-command buffer 0 (file-truename (car files)) "finfo" "-l")
 (vc-fossil-print-log (cdr files) buffer)))
 
 ;; TBD: log-entry
@@ -265,7 +265,7 @@
 (with-temp-buffer
   (let ((found (not rev))
(newver nil))
-   (insert (vc-fossil--run "finfo" "-l" "-b" file))
+   (insert (vc-fossil--run "finfo" "-l" "-b" (file-truename file)))
;; (vc-fossil--call "fossil" "finfo" "-l" "-b" file)
(goto-char (point-min))
(while (not (eobp))
@@ -283,7 +283,7 @@
 (with-temp-buffer
   (let ((found (not rev))
(oldver nil))
-   (insert (vc-fossil--run "finfo" "-l" "-b" file))
+   (insert (vc-fossil--run "finfo" "-l" "-b" (file-truename file)))
;; (vc-fossil--call "fossil" "finfo" "-l" "-b" file)
(goto-char (point-min))
(while (not (eobp))
@@ -296,9 +296,9 @@
 
 
 (defun vc-fossil-delete-file (file)
-  (vc-fossil-command nil 0 file "rm"))
+  (vc-fossil-command nil 0 (file-truename file) "rm"))
 
 (defun vc-fossil-rename-file (old new)
-  (vc-fossil-command nil 0 (list old new) "mv"))
+  (vc-fossil-command nil 0 (list (file-truename old) (file-truename new)) 
"mv"))
 
 (provide 'vc-fossil)

[nongnu] elpa/vc-fossil f69eac0 047/111: Add end-of-file comment.

[ELPA Syncer]

branch: elpa/vc-fossil
commit f69eac0a0b20632715d60523ac455c4fe8bfba29
Author: fifr 
Commit: fifr 

Add end-of-file comment.

Required by Emacs standards.
---
 vc/el/vc-fossil.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index de9b635..ec96257 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -311,3 +311,5 @@ If `files` is nil return the status for all files."
   (vc-fossil-command nil 0 (list (file-truename old) (file-truename new)) "mv" 
"--hard"))
 
 (provide 'vc-fossil)
+
+;;; vc-fossil.el ends here

[nongnu] elpa/vc-fossil 3455e4a 049/111: Access command switches by `vc-switches`.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 3455e4a545b1d72e051ca7b451ddc036558b21d7
Author: fifr 
Commit: fifr 

Access command switches by `vc-switches`.
---
 vc/el/vc-fossil.el | 16 
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index efa66fd..535f620 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -194,22 +194,16 @@ If `files` is nil return the status for all files."
 
 (defun vc-fossil-checkin (files rev comment)
   (apply 'vc-fossil-command nil 0 files "commit" "-m" comment
- (if (stringp vc-checkin-switches)
- (list vc-checkin-switches)
-   vc-checkin-switches)))
+ (vc-switches 'Fossil 'checkin)))
 
 (defun vc-fossil-find-revision (file rev buffer)
   (if (zerop (length rev))
   (apply #'vc-fossil-command buffer 0 file
  "cat"
- (if (listp vc-checkout-switches)
- vc-checkout-switches
-   (list vc-checkout-switches)))
+ (vc-switches 'Fossil 'checkout))
 (apply #'vc-fossil-command buffer 0 file
"cat" "-r" rev
-   (if (listp vc-checkout-switches)
-   vc-checkout-switches
- (list vc-checkout-switches)
+   (vc-switches 'Fossil 'checkout
 
 (defun vc-fossil-checkout (file &optional editable rev)
   (apply #'vc-fossil-command nil 0 file
@@ -218,9 +212,7 @@ If `files` is nil return the status for all files."
   ((eq rev t) nil)
   (rev (list rev))
   (t nil))
- (if (listp vc-checkout-switches)
- vc-checkout-switches
-   (list vc-checkout-switches)
+ (vc-switches 'Fossil 'checkout
 
 (defun vc-fossil-revert (file &optional contents-done)
   "Revert FILE to the version stored in the fossil repository."

[nongnu] elpa/vc-fossil adb17bc 034/111: Use file-truename in vc-fossil-state otherwise status is not returned if called from outside a fossil tree

[ELPA Syncer]

branch: elpa/vc-fossil
commit adb17bcf922fd6c026ccb655c55da5e1b4cbeb36
Author: venks 
Commit: venks 

 Use file-truename in vc-fossil-state otherwise status is not returned if 
called from outside a fossil tree
---
 vc/el/vc-fossil.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 8515024..355b6bc 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -107,8 +107,8 @@
 
 (defun vc-fossil-state  (file)
   "Fossil specific version of `vc-state'."
-  ;; (message (format "vc-fossil-state on %s" file))
-  (let ((line (vc-fossil--run "update" "-n" "-v" "current" file)))
+  ;; (message (format "vc-fossil-state on %s %s" file (file-truename file)))
+  (let ((line (vc-fossil--run "update" "-n" "-v" "current" (file-truename 
file
 (and line
 (vc-fossil-state-code (car (split-string line))
 

[nongnu] elpa/vc-fossil be45ea1 066/111: Declare some unknown function and variables.

[ELPA Syncer]

branch: elpa/vc-fossil
commit be45ea19cd9c162ec373971429eecc9fd78706d1
Author: fifr 
Commit: fifr 

Declare some unknown function and variables.
---
 vc/el/vc-fossil.el | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 4c2169e..b3558aa 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -8,7 +8,7 @@
 
 ;;; Installation:
 
-;; 1. Put this file somewhere in the emacs load-path.
+;; 1. Put this file somewhere in the Emacs load-path.
 ;; 2. Tell Emacs to load it when needed:
 ;;(autoload 'vc-fossil-registered "vc-fossil")
 ;; 3. Add Fossil to the list of supported backends:
@@ -37,8 +37,12 @@
 ;; - delete-file (file)
 ;; - rename-file (old new)
 
+;;; Code:
+
 (eval-when-compile (require 'vc))
 
+(autoload 'vc-switches "vc")
+
 ;;; Customization
 
 (defgroup vc-fossil nil
@@ -239,6 +243,8 @@ If `files` is nil return the status for all files."
 ;; FIXME, we actually already have short, start and limit, need to
 ;; add it into the code
 
+(autoload 'vc-setup-buffer "vc-dispatcher")
+
 (defun vc-fossil-print-log (files buffer &optional shortlog start-revision 
limit)
   "Print full log for a file"
   (vc-setup-buffer buffer)
@@ -251,6 +257,11 @@ If `files` is nil return the status for all files."
 (when limit (list "-n" (number-to-string limit)))
 (list "-p" (file-relative-name (expand-file-name file)
 
+(defvar log-view-message-re)
+(defvar log-view-file-re)
+(defvar log-view-font-lock-keywords)
+(defvar log-view-per-file-logs)
+
 (define-derived-mode vc-fossil-log-view-mode log-view-mode "Fossil-Log-View"
   (require 'add-log) ;; we need the add-log faces
   (setq word-wrap t)
@@ -290,6 +301,8 @@ If `files` is nil return the status for all files."
  (rev1 (list "--from" rev1)))
 (vc-switches 'Fossil 'diff)
 
+(declare-function vc-annotate-convert-time "vc-annotate" (time))
+
 (defun vc-fossil-annotate-command (file buffer &optional rev)
   "Execute \"fossil annotate\" on FILE, inserting the contents in BUFFER.
 If REV is specified, annotate that revision."

[nongnu] elpa/vc-fossil 6619ffb 048/111: Improve log command.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 6619ffba74686cf6c8439a5ec362a9cb7c4334b5
Author: fifr 
Commit: fifr 

Improve log command.

 * support limits
 * colorize output using custom `vc-fossil-log-view-mode`
---
 vc/el/vc-fossil.el | 33 -
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index ec96257..efa66fd 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -234,11 +234,34 @@ If `files` is nil return the status for all files."
 
 (defun vc-fossil-print-log (files buffer &optional shortlog start-revision 
limit)
   "Print full log for a file"
-  (when files
-(vc-fossil-command buffer 0 (car files) "finfo" "-l")
-(vc-fossil-print-log (cdr files) buffer)))
-
-;; TBD: log-entry
+  (vc-setup-buffer buffer)
+  (let ((inhibit-read-only t))
+(with-current-buffer buffer
+  (dolist (file files)
+(apply #'vc-fossil-command buffer 0 nil "timeline"
+   (nconc
+(when start-revision (list "before" start-revision))
+(when limit (list "-n" (number-to-string limit)))
+(list "-p" file)))
+
+(define-derived-mode vc-fossil-log-view-mode log-view-mode "Fossil-Log-View"
+  (require 'add-log) ;; we need the add-log faces
+  (set (make-local-variable 'log-view-file-re) "\\`a\\`")
+  (set (make-local-variable 'log-view-per-file-logs) nil)
+  (set (make-local-variable 'log-view-message-re)
+   "^[0-9:]+ \\[\\([0-9a-fA-F]*\\)\\] \\(?:\\*[^*]*\\*\\)? ?\\(.*\\)")
+  (set (make-local-variable 'log-view-font-lock-keywords)
+   (append
+'(
+  ("^\\([0-9:]*\\) \\(\\[[[:alnum:]]*\\]\\) 
\\(\\(?:\\*[[:word:]]*\\*\\)?\\) ?\\(.*?\\) (user: \\([[:word:]]*\\) tags: 
\\(.*\\))"
+   (1 'change-log-date)
+   (2 'change-log-name)
+   (3 'highlight)
+   (4 'log-view-message)
+   (5 'change-log-name)
+   (6 'highlight))
+  ("^=== \\(.*\\) ==="
+   (1 'change-log-date))
 
 (defun vc-fossil-diff (file &optional rev1 rev2 buffer)
   "Get Differences for a file"

[nongnu] elpa/vc-fossil b632993 050/111: Handle switches in diff command.

[ELPA Syncer]

branch: elpa/vc-fossil
commit b63299313f924b4080396c46e3c9fe09838e2413
Author: fifr 
Commit: fifr 

Handle switches in diff command.
---
 vc/el/vc-fossil.el | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 535f620..ba2f7bc 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -39,6 +39,22 @@
 
 (eval-when-compile (require 'vc))
 
+;;; Customization
+
+(defgroup vc-fossil nil
+  "VC Fossil backend."
+  :group 'vc)
+
+(defcustom vc-fossil-diff-switches t ; Fossil doesn't support common args like 
-u
+  "String or list of strings specifying switches for Fossil diff under VC.
+If nil, use the value of `vc-diff-switches'.  If t, use no switches."
+  :type '(choice (const :tag "Unspecified" nil)
+ (const :tag "None" t)
+ (string :tag "Argument String")
+ (repeat :tag "Argument List" :value ("") string))
+  :group 'vc-fossil)
+
+
 ;;; BACKEND PROPERTIES
 
 (defun vc-fossil-revision-granularity () 'repository)
@@ -260,8 +276,10 @@ If `files` is nil return the status for all files."
   (let ((buf (or buffer "*vc-diff*")))
 (apply #'vc-fossil-command
buf 0 file "diff" "-i"
-   `(,@(if rev1 `("--from" ,rev1) '())
- ,@(if rev2 `("--to" ,rev2) '())
+   (nconc
+(and rev1 (list "--from" rev1))
+(and rev2 (list "--to" rev2))
+(vc-switches 'Fossil 'diff)
 
 ;;; TAG SYSTEM
 

[nongnu] elpa/vc-fossil 54df12a 045/111: Fix parameter passing in `vc-fossil-find-revision`.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 54df12a4a6ee90b51db908217bb491a532bb3fd5
Author: fifr 
Commit: fifr 

Fix parameter passing in `vc-fossil-find-revision`.

The parameter `vc-checkout-switches` can be a list OR a string.
---
 vc/el/vc-fossil.el | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index d32a724..f39cef7 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -202,10 +202,14 @@ If `files` is nil return the status for all files."
   (if (zerop (length rev))
   (apply #'vc-fossil-command buffer 0 file
  "cat"
- vc-checkout-switches)
+ (if (listp vc-checkout-switches)
+ vc-checkout-switches
+   (list vc-checkout-switches)))
 (apply #'vc-fossil-command buffer 0 file
"cat" "-r" rev
-   vc-checkout-switches)))
+   (if (listp vc-checkout-switches)
+   vc-checkout-switches
+ (list vc-checkout-switches)
 
 (defun vc-fossil-checkout (file &optional editable rev)
   (apply #'vc-fossil-command nil 0 file

[nongnu] elpa/vc-fossil dffd034 069/111: Pipe commit message through log-edit-extract-headers.

[ELPA Syncer]

branch: elpa/vc-fossil
commit dffd03414e37123cae892ebe777d67596ad371c2
Author: fifr 
Commit: fifr 

Pipe commit message through log-edit-extract-headers.

See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18954
---
 vc/el/vc-fossil.el | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index b3558aa..b3cbb77 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -211,10 +211,16 @@ If `files` is nil return the status for all files."
 (defun vc-fossil-unregister (file)
   (vc-fossil-command nil 0 file "rm"))
 
+(declare-function log-edit-extract-headers "log-edit" (headers string))
 
 (defun vc-fossil-checkin (files rev comment)
-  (apply 'vc-fossil-command nil 0 files "commit" "-m" comment
- (vc-switches 'Fossil 'checkin)))
+  (apply 'vc-fossil-command nil 0 files
+ (nconc (list "commit" "-m")
+(log-edit-extract-headers
+ `(("Author" . "--user-override")
+   ("Date" . "--date-override"))
+ comment)
+(vc-switches 'Fossil 'checkin
 
 (defun vc-fossil-find-revision (file rev buffer)
   (apply #'vc-fossil-command buffer 0 file

[nongnu] elpa/vc-fossil 866bd8d 059/111: Use relative file names in print-log command.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 866bd8d0f0bc034dd7a1b9a40dad342545035fcc
Author: fifr 
Commit: fifr 

Use relative file names in print-log command.

This is required by the called `timeline` fossil command.
---
 vc/el/vc-fossil.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 1b5af79..44d0f73 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -250,7 +250,7 @@ If `files` is nil return the status for all files."
(nconc
 (when start-revision (list "before" start-revision))
 (when limit (list "-n" (number-to-string limit)))
-(list "-p" (expand-file-name file
+(list "-p" (file-relative-name (expand-file-name file)
 
 (define-derived-mode vc-fossil-log-view-mode log-view-mode "Fossil-Log-View"
   (require 'add-log) ;; we need the add-log faces

[nongnu] elpa/vc-fossil 49552ae 046/111: Delete and rename modify working directory.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 49552ae77ee71910c10974c92c3f0a74930f30ad
Author: fifr 
Commit: fifr 

Delete and rename modify working directory.

This is supported by newer fossil with an additional switch.
---
 vc/el/vc-fossil.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index f39cef7..de9b635 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -305,9 +305,9 @@ If `files` is nil return the status for all files."
 
 
 (defun vc-fossil-delete-file (file)
-  (vc-fossil-command nil 0 (file-truename file) "rm"))
+  (vc-fossil-command nil 0 (file-truename file) "rm" "--hard"))
 
 (defun vc-fossil-rename-file (old new)
-  (vc-fossil-command nil 0 (list (file-truename old) (file-truename new)) 
"mv"))
+  (vc-fossil-command nil 0 (list (file-truename old) (file-truename new)) "mv" 
"--hard"))
 
 (provide 'vc-fossil)

[nongnu] elpa/vc-fossil 4ce0039 052/111: Enable word-wrap with indentation in log view.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 4ce003972cf91cc08ba805dab2a44af9c0a0e2d2
Author: fifr 
Commit: fifr 

Enable word-wrap with indentation in log view.
---
 vc/el/vc-fossil.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 8bb939f..c588953 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -254,6 +254,8 @@ If `files` is nil return the status for all files."
 
 (define-derived-mode vc-fossil-log-view-mode log-view-mode "Fossil-Log-View"
   (require 'add-log) ;; we need the add-log faces
+  (toggle-word-wrap 1)
+  (set (make-local-variable 'wrap-prefix) "  ")
   (set (make-local-variable 'log-view-file-re) "\\`a\\`")
   (set (make-local-variable 'log-view-per-file-logs) nil)
   (set (make-local-variable 'log-view-message-re)