Mercurial > emacs
view lisp/hexl.el @ 105973:b7d8222914b4
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-clone-subtree-with-time-shift): Make it work at the
end of the buffer.
* org-mobile.el (org-mobile-write-checksums): Specify coding
system.
(org-mobile-timestamp-buffer): Keep local variable/mode line at
beginning of buffer.
* org-latex.el (org-latex-entities-regexp): Fix typo in regexp.
* org.el (org-block-todo-from-children-or-siblings-or-parent)
(org-block-todo-from-checkboxes): Do not block changes to a nil
TODO state.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-habit.el (org-habit-parse-todo): Indicate which habit is
wrongly set up in the error messages.
* org-colview.el (org-columns-display-here): Don't try to
calculate values if the underlying property is not set.
(org-columns-string-to-number): Convert age strings back into
fractional days.
(org-agenda-colview-summarize): Handle extended summary types
properly.
* org-colview-xemacs.el (org-columns-display-here): Don't try to
calculate values if the underlying property is not set.
(org-columns-string-to-number): Convert age strings back into
fractional days.
(org-agenda-colview-summarize): Handle extended summary types
properly.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-drawer-function): New variable.
(org-export-format-drawer): New function.
(org-export-preprocess-string): Pass the backend as a parameter to
`org-export-remove-or-extract-drawers'.
(org-export-remove-or-extract-drawers): New parameter BACKEND.
* org-protocol.el (org-protocol-char-to-string): New defsubst.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file): Add error
message when no block is selected.
* org-latex.el (org-export-latex-links): Check for protectedness
in the last matched character, not after the match.
* org-datetree.el (org-datetree-find-date-create): Respect
restriction when KEEP-RESTRICTION is set.
(org-datetree-file-entry-under): New function.
(org-datetree-cleanup): New command.
2009-11-13 Dan Davison <davison@stats.ox.ac.uk>
* org-src.el (org-edit-src-code): New optional argument context
allows calling functions to avoid altering the saved window
configuration.
(org-edit-src-exit): Do not restore window configuration when this
function is used in the context of saving the edit buffer.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-out, org-clock-cancel): Revert to
instances to switching to with-current-buffer, because these seem
to cause problems - no idea why.
* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
Require diary-lib for (diary-date-display-form).
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-log-reschedule, org-log-redeadline): New options.
(org-log-note-headings): Add templates for rescheduling and
deadline changing.
(org-startup-options): Add in-buffer settings for logging changing
schedule and deadline time stamps.
(org-deadline, org-schedule): Check for existing date and arrange
for logging if the user requests it.
(org-add-log-note): Prepare proper note buffers for rescheduling
and deadline changes.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file)
(org-agenda-add-entry-to-org-agenda-diary-file)
(org-agenda-insert-diary-make-new-entry): New functions.
(org-agenda-diary-entry): Call
`org-agenda-diary-entry-in-org-file' when appropriate.
* org.el (org-calendar-insert-diary-entry-key): New option.
(org-agenda-diary-file): New option.
("calendar"): Install our insertion function in the calendar.
* org-remember.el (org-datetree): Require.
(org-remember-templates): Add new positioning option.
(org-remember-reference-date): New variable.
(org-remember-apply-template): Store the reference date in a local
variable.
(org-remember-handler): Implement date tree positioning of entries.
* org-datetree.el: New file.
* org-latex.el (org-export-latex-preprocess): Protect targets in
verbatim emphasis.
* org-html.el (org-export-as-html): Protect targets in verbatim
emphasis.
* org-docbook.el (org-export-as-docbook): Protect targets in
verbatim emphasis.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-show-notification): Handle messages that
contain a percent character.
* org-remember.el (org-remember-apply-template): Turn of partial
completion.
* org-mobile.el (org-mobile-before-process-capture-hook): New hook.
(org-mobile-pull): Run `org-mobile-before-process-capture-hook'.
* org.el (org-indent-mode): Define variable already in org.el.
(org-unfontify-region): Remove line-prefix and wrap-prefix
properties only if org-indent-mode is active.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-print-icalendar-entries): Save match data
around call to verify function.
(org-print-icalendar-entries): Add a call to the verification
function.
* org.el (org-speedbar-set-agenda-restriction): Remove unnecessary
save-restrivtion' form.
2009-11-13 Dan Davison <davison@stats.ox.ac.uk>
* org-exp.el (org-export-format-source-code-or-example): restrict
scope of preserve-indentp to the let binding.
(org-src): require org-src, since org-src-preserve-indentation is used.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-timer.el (org-timer-set-timer): Set variables
org-timer-timer[123] correctly.
* org-mobile.el (org-mobile-files-alist): Make it work when
`agenda-archives' is included in
`org-agenda-text-search-extra-files'.
(org-mobile-push): Restore agenda after mobile push.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-resolve-clocks-if-idle): Another fix to the
way the amount of idle time is presented in the minibuffer.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-print-icalendar-entries): Use
org-icalendar-verify-function only if non-nil.
* org.el (org-refile): Refile to clock only if the prefix arg is
2.
(org-sparse-tree): Fix docstring to be in line with prompt.
(org-update-parent-todo-statistics): Call
`org-after-todo-statistics-hook' on each level.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-apply-template): Make sure the
buffer exists.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-tab-ind-state): New variable.
(org-cycle-level): New function.
(org-cycle-level-after-item/entry-creation): New option.
(org-flag-subtree): New function.
(org-hide-archived-subtrees): Call `org-flag-subtree'.
(org-set-effort): Indexed access.
* org-list.el (org-cycle-item-indentation): New function.
* org.el (org-refile): Make prefix argument 2 refile to current
clock.
(org-priority): Interpret action `remove' as call to remove the
priority cookie.
* org-remember.el (org-remember-apply-template): Don't depend on
buffer name being like file name.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-play-sound): Expand file in
org-clock-sound, to allow ~ for home.
* org-remember.el (org-remember-handler): Set
text-before-node-creation even if this already looks like a node,
because the string might be needed on non-org-mode target files.
* org-agenda.el (org-agenda-open-link): Make this work in agenda
clocktables.
(org-agenda-switch-to): Follow a link at point if
org-return-follows-link' is set and there is nothing else to do in
this line.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview-xemacs.el: Add in changes from org-colview.el
2009-11-13 Dan Davison <davison@stats.ox.ac.uk>
* org-exp-blocks.el: Modify split separator regexp to avoid empty
strings.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-columns-new): Make this work with the new
operators.
(org-columns-store-format): Make this work with the new operators.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el (org-src-preserve-indentation): Document that this
variable is also used during export.
* org-exp.el (org-export-format-source-code-or-example): Preserve
indentation if a block has a -i option, or if
`org-src-preserve-indentation' is set.
* org-exp-blocks.el (org-export-blocks-preprocess): Preserve
indentation if a block has a -i option, or if
`org-src-preserve-indentation' is set.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-mode-map): Define the new archiving keys.
(org-speed-commands-default): Define an archiving key in the speed
command map.
(org-org-menu): Improve the menu structure concerning archiving.
* org-archive.el (org-archive-subtree-default-with-confirmation):
New command.
* org-agenda.el (org-agenda-mode-map): Define the new archiving keys.
(org-agenda-menu): Add the new archiving commands to the menu.
(org-agenda-archive-default)
(org-agenda-archive-default-with-confirmation): New commands.
(org-agenda-archive, org-agenda-archive-to-archive-sibling): Just
call `org-agenda-archive-with'.
(org-agenda-archive-with): New function.
* org-table.el (org-table-convert-region): Inert spaces around "|"
to avoid line beginnings like "|-1" which will be mistaken as
hlines.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-offer-links-in-entry): Return nil if there are no
links, t if a link has been selected.
(org-open-at-point): Open attachment directory when called in the
headline and there are no links in the entry body.
(org-speed-commands-default): Add "o" for open-at-point as a speed
command.
* org-attach.el (org-attach-reveal): Optional prefix arg
IF-EXISTS, which avoids creating the attachment directory if it
does not yet exist.
* org-agenda.el (org-agenda, org-run-agenda-series): Evaluate
MATCH.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el ("abbrev"): Work with abbrev tables only after they have
been loaded.
* org-list.el (org-list-send-list): Fix bug related to match
data.
* org-latex.el (org-export-latex-fontify): Apply verbatim
emphasis.
(org-export-latex-make-header): Insert \obeylines if line breaks
should be preserved.
* org-exp.el (org-export-protect-verbatim): Add an
`org-verbatim-emph' property to such text.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-icalendar-use-plain-timestamp): New option.
(org-print-icalendar-entries): Skip entries where the timestamp is
not a deadline and not scheduled, if the user requests that.
* org-latex.el (org-export-latex-quotation-marks): Allow a bracket
before an opening quote.
* org-archive.el (org-archive-subtree): Keep archive after
archiving something.
* org-id.el (org-id-update-id-locations): Add archive files if
that is required by `org-id-extra-files'.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el (org-src-window-setup): New option.
(org-src-switch-to-buffer): New function.
(org-edit-src-exit): Add optional argument CONTEXT and use it to
restore window configuration.
(org-edit-src-code, org-edit-src-continue, org-edit-src-exit):
Call `org-src-switch-to-buffer'.
* org.el (org-default-properties): Add STYLE property.
(org-files-list): Use the function call to get the files.
(org-additional-option-like-keywords): Add SETUPFILE to completion
list.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-convert-region): Correctly interpret
quoting in csv import.
* org.el (org-icompleting-read): Make iswitchb completion work
with lists and tables.
* org-agenda.el (org-agenda-add-entry-text): Never add entry text
while pushing the mobile agenda.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el
(org-clock-auto-clock-resolution): Now takes three values: nil, t
and `when-no-clock-is-running'.
(org-clock-in): Use `org-clock-auto-clock-resolution' to determine
whether or not to resolve Org buffers on clock in.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-format-time-period): Function to format
times in fractional days for display.
(org-columns-display-here): Add support for showing a calculated
value in place of the property.
(org-columns): Set `org-columns-time' to the current time so time
difference calculations will work.
(org-columns-time): Use to store the current time when column view
is displayed, so all time differences will use the same reference
point.
(org-columns-compile-map): There is now an extra position in each
entry specifying the function to use to calculate the displayed
value for the non-calculated properties in the column,
(org-columns-compute-all): Set `org-columns-time' to the current
time so time difference calculations will work.
(org-columns-compute): Handle column operators where the values
used are calculated from the underlying property.
(org-columns-number-to-string): Handle the 'age' column format
(org-columns-string-to-number): Correct the function name (was
org-column...). Add support for the 'age' column format.
(org-columns-compile-format): Support the additional parameter in
org-columns-compile-map.
2009-11-13 Bastien Guerry <bzg@altern.org>
* org.el (org-mode-hook): Turn `org-mode-hook' into a customizable
variable.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-has-been-used): New variable.
(org-clock-in): Set `org-clock-has-been-used'.
(org-clock-save): Save only if clock data has been used or created
during this session.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-persist): New value, to store only the
clock history.
(org-clock-save): Don't save the clock if only the history should
be stored.
(org-clock-load): Turn off John Wiegley's auto resolving mechanism
when restoring a saved clock.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-clock-display, org-clock-put-overlay): Use
`org-time-clock-use-fractional'.
* org.el (org-time-clocksum-use-fractional)
(org-time-clocksum-fractional-format): Two new customizable
variables which allow the user to select fractional times (1.25
instead of 1:25) in the `org-clock-display' report.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-ascii.el (org-export-ascii-table-keep-all-vertical-lines):
New option.
* org.el (org-tag-alist): Fix customization type.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-update-checksum-for-capture-file):
Make sure the regexp search can fail without throwing an error.
(org-mobile-apply): Save the inbox buffer after removing
successfully applied changes.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-resolve-clocks-if-idle): Fix to the way idle
time is reported after the user comes back (but before they
resolve time).
* org.el (org-get-repeat): Change so that this function can be
called with either `org-scheduled-string' or
`org-deadline-string'.
* org-clock.el (org-clock-auto-clock-resolution): Renamed
`org-clock-disable-clock-resolution', since negatives don't sound
good in customization variables.
(org-clock-in): Don't use the auto-resolution logic if the user is
clocking into a different task while an active clock is running.
This then allows the default behavior of clocking out of the open
task and then into the new task.
* org.el (org-modules): Made this variable more consistent, since
it was referring to Org, OrgMode and Org-mode, whereas the docs
for the variable always refer to Org-mode.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-repeat-re): The changed org-repeat-re no longer
matched simple +2d type repeaters. Fix it so it does.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Protect the vspace
macro in the VERSE environment.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-habit.el (org-habit-get-priority): A new function that
determines the relative priority of a habit, based on how long
past its scheduled date it is, and how near the deadline is.
* org-agenda.el (org-agenda-get-scheduled): Set habit priority
using `org-habit-get-priority'.
* org-habit.el (org-habit-build-graph): Start displaying colors
from the first scheduled date, if that date is earlier than the
first completion date.
* org-habit.el: Changed all "color" variables to faces, and made
them appropriate for light and dark backgrounds.
* org-habit.el (org-habit-duration-to-days): Made this function
more general.
(org-habit-parse-todo): Parse the new ".+N/N" style repeater.
* org-agenda.el (org-agenda-get-deadlines): Removed all mention of
habits, since they don't use DEADLINE anymore.
* org.el (org-repeat-re, org-display-custom-time)
(org-timestamp-change): Extended to support the new ".+N/N"
syntax, used for habits.
* org-clock.el (org-clock-resolve-clock): Fixed an incorrect
variable reference.
* org-agenda.el (org-agenda-set-mode-name): Show Habit in the
modeline when habits are being displayed (if that module is being
loaded).
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-clock.el (org-x11-idle-seconds): Add a method to get the X11
idle time using the xscreensaver extension.
(org-user-idle-seconds): Use X11 idle time if available.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-next-line): New command.
(org-agenda-previous-line): New commands.
(org-agenda-show-and-scroll-up, org-agenda-show-scroll-down): New
commands.
(org-agenda-follow-mode): Do the follow immediately if the mode is
turned on here.
(previous-line, next-line): Replace keys with the corresponding
org functions.
(org-agenda-mode-map): Bind backspace and delete to the scrolling
command.
* org.el (org-icompleting-read): Turn off partial completion mode
for the duration of this completion round.
* org-latex.el (org-export-latex-fontify-headline): Protect TeX
macros in author lines and similar stuff.
* org.el (org-file-tags): Fix docstring.
(org-get-buffer-tags): Add the #+FILETAGS tags.
("ecb"): Maks ecb show context after jumping into an Org file.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-agenda.el (org-finalize-agenda): Draw habit consistency
graphs after everything else in the buffer has been setup.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-apply): Count success and failure.
* org.el (org-indent-line-function): Fix regexp replace problem.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-clock.el (org-clock-disable-clock-resolution): New
customization variable that disable automatic clock resolution on
clock in.
(org-clock-in): If `org-clock-disable-clock-resolution' is set, do
not automatically resolve anything. This is does not affect
idle-time resolution, however, if `org-clock-idle-time' is set.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-habit.el: New file, which implements code to build a "habit
consistency graph".
* org-agenda.el (org-agenda-get-deadlines)
(org-agenda-get-scheduled): Display consistency graphs when
outputting habits into the agenda. The graphs are always relative
to the current time.
(org-format-agenda-item): Added new parameter `habitp', which
indicates whether we are formatting a habit or not. Do not
display "extra" leading information if habitp is true.
* org.el (org-repeat-re): Improved regexp to include .+ and ++
leaders for repeat strings.
(org-get-repeat): Now takes a string parameter `tagline', so the
caller can obtain the SCHEDULED repeat, or the DEADLINE repeat.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-agenda.el (org-agenda-auto-exclude-function): New
customization variable for allowing the user to create an "auto
exclusion" filter for doing context-aware auto tag filtering.
(org-agenda-filter-by-tag): Changes to support the use of
`org-agenda-auto-exclude-function'. See the new manual addition,.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org.el (org-files-list): Don't attempt to return a file name for
Org buffers which have no associated file.
* org-agenda.el (org-agenda-do-action): Fixed a typo.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-locate-entry): Interpret files
relative to org-directory.
(org-mobile-inbox-for-pull): Document the best location for this
file.
(org-mobile-check-setup): Verify `org-directory'.
(org-mobile-create-index-file): Sort the files to be listed in
index.org.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-fast-tag-selection): Add a way to display a
description for a tag group. This is done by adding a string to
either the startgroup or endgroup cell.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-resolve, org-resolve-clocks)
(org-emacs-idle-seconds): Use `org-float-time' instead of
`time-to-seconds'
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-sorting-strategy): Fix customization
type.
* org.el (org-pre-cycle-hook): Document that `empty' can also be
the value of ARG when doing local cycling.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-clock.el (org-clock-resolve-clock): If keeping or
subtracting time results in a clock out at a time in the past, and
if the resolution occurred due to idleness or invoking `M-x
org-resolve-clocks', remember that past moment in time. On the
next clock in, the user will be prompted to see if they want to
back-date their new clock to then.
(org-clock-resolve): Do not jump the user to the location of a
dangling clock if the resolution is occuring due to an idle
timeout. In that case there is typically only one dangling clock,
the active one, and there is no value gained by shuffling their
windows around to show it to them. Being prompted to resolve an
idle clock should be as inobtrusive as possible.
(org-resolve-clocks-if-idle): New function that resolves only the
currently active clock if the user has exceeded the time returned
by `org-user-idle-seconds', based on the value of
`org-clock-idle-time'.
(org-clock-in): If, after resolving clocks,
(org-clock-out): Cancel the `org-clock-idle-timer' on clock out.
* org-clock.el (org-clock-resolve-clock): New function that
resolves a clock to a specific time, closing or resuming as need
be, and possibly even starting a new clock.
(org-clock-resolve): New function used by `org-resolve-clocks'
that sets up for the call to `org-clock-resolve-clock'. It
determines the time to resolve to based on a single-character
selection from the user to either keep time, subtract away time or
cancel the clock.
(org-resolve-clocks): New user command which resolves dangling
clocks -- that is, open but not active -- anywhere in the file
list returned by `org-files-list'.
(org-clock-in): Automatically resolve dangling clocks whenever a
user clocks in.
(org-clock-cancel): If the user cancels the solely clock in a
LOGBOOK, remove the empty drawer.
* org-clock.el (org-clock-idle-time): New user customizable option
for detecting whether the user has left a clock idle. Note: it is
only used in this commit to test whether it's worthwhile to check
OS X to get the Mac user's current idle time. If the Emacs idle
time is less than the value, the user hasn't been away long enough
to be worth checking (a more expensive test than just getting
Emacs idle time).
(org-user-idle-seconds, org-mac-idle-seconds)
(org-emacs-idle-seconds): This three functions, in conjunction
with the user customization variable `org-clock-idle-time', return
the number of seconds (as a floating point) that the user has been
away from their Emacs (or, if running on OS X, their computer).
* org-clock.el (org-find-open-clocks): New function that returns a
list of all open clocks in the given FILE. Note that each clock
it returns is a cons cell of the format (MARKER . START-TIME).
This "clock" value is used by several of the new clock module
utility functions.
(org-is-active-clock): New inline function which tests whether the
given clock value is the same as the currently active clock.
Returns non-nil if this is the case.
(org-with-clock-position): New macro that evaluates FORMS with
point in the buffer and at the position of the given clock.
Changes to the current clock are global.
(org-with-clock): New macro that evaluates FORMS with point in the
buffer and at the position of the given clock. However, changes
to the current clock are local and have no effect on the user's
active clock. This allows, for example, far any clock to be
cancelled without cancelling the active clock.
(org-clock-clock-in): New inline function that switches the active
clock to the given clock. If either the argument RESUME, or the
global `org-clock-in-resume', are non-nil, it will resume a clock
that was previously left open.
(org-clock-clock-out): New inline function that clocks out the
given clock value without affecting the currently active clock.
(org-clock-clock-cancel): New inline function that cancels the
given clock value without affecting the currently active clock.
* org-clock.el (org-clock-in): Before creating
`org-clock-mode-line-timer', check to make sure an older timer is
not currently running.
(org-clock-out): Accept new third parameter `at-time', which
permits a clock to be clocked out at a specific time. Note that
no attempt is made to verify that the clock out time is later than
the clock in time.
* org.el (org-files-list): New utility function for returning a
list of all open org-mode buffers, plus all files used to build
the agenda buffer. Note that not all the files will necessarily
be visited by a buffer at time of call.
(org-entry-beginning-position): Like the function
`line-beginning-position', this inline function returns the
beginning position of the current heading/entry.
(org-entry-end-position): Like the function `line-end-position',
this inline function returns the end position of the current
heading/entry.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-list): Mark the all-todo items line as
a header line.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-inlinetask-remove-END-maybe): Declare function.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-filter-make-matcher): Allow to filter
entries that have no tags.
(org-agenda-search-view): New customize group.
(org-agenda-search-view-search-words-only): New option.
(org-search-view): Implement substring search.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-outline-level): Add doc string.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-inlinetask.el (org-inlinetask-export): Re-introduce
variable.
(org-inlinetask-export-handler): Only export inline task if the
user option calls for it.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-handle-export-tags): Remove inlinetask
END if present.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-tables): Don't format in
protected regions.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el (org-edit-src-code)
(org-edit-src-find-region-and-lang, org-edit-src-exit): Handle
macro editing.
* org-agenda.el (org-prefix-category-max-length): New variable.
(org-format-agenda-item): Use `org-prefix-category-max-length'.
(org-compile-prefix-format): Set `org-prefix-category-max-length'.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-create-index-file): Improve the
listing of tags and todo keywords.
* org-latex.el (org-export-latex-format-image): New function.
(org-export-latex-links): Use `org-export-latex-format-image'.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-inlinetask.el (org-inlinetask-get-current-indentation)
(org-inlinetask-remove-terminator): New functions.
(org-inlinetask-export-handler): Terminate the description list.
* org-exp.el (org-export-select-backend-specific-text): Remove the
region markers.
* org-inlinetask.el (org-inlinetask-export-handler): fix bug for
tasks without content.
* org-clock.el: Make sure the clock-in target position does not
move to a different node by widening the buffer.
* org-html.el (org-export-html-format-image): Wrap image into
figure div only when there is a caption.
* org-archive.el (org-archive-mark-done): Change default value to
nil.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-context): Call `bobp', not `eobp'.
* org-clock.el (org-clock-cancel): Remove quotes from marker
variables.
* org.el (org-read-date-prefer-future): New allowed value `time'.
(org-read-date-analyze): Shift day to tomorrow depending on time
entered and value of `org-read-date-prefer-future'.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Fri, 13 Nov 2009 08:37:55 +0000 |
parents | bd2966850aac |
children | 1d1d5d9bd884 |
line wrap: on
line source
;;; hexl.el --- edit a file in a hex dump format using the hexl filter ;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu> ;; Maintainer: FSF ;; Keywords: data ;; This file is part of GNU Emacs. ;; GNU Emacs 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. ;; GNU Emacs 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. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; This package implements a major mode for editing binary files. It uses ;; a program called hexl, supplied with the GNU Emacs distribution, that ;; can filter a binary into an editable format or from the format back into ;; binary. For full instructions, invoke `hexl-mode' on an empty buffer and ;; do M-x `describe-mode'. ;; ;; NOTE: Remember to change `hexl-program' or `hexl-options' if needed. ;; ;; Currently hexl only supports big endian hex output with 16 bit ;; grouping. ;; ;; -iso in `hexl-options' will allow iso characters to display in the ;; ASCII region of the screen (if your Emacs supports this) instead of ;; changing them to dots. ;;; Code: (require 'eldoc) (eval-when-compile (require 'cl)) ;; ;; vars here ;; (defgroup hexl nil "Edit a file in a hex dump format using the hexl filter." :group 'data) (defcustom hexl-program "hexl" "The program that will hexlify and dehexlify its stdin. `hexl-program' will always be concatenated with `hexl-options' and \"-de\" when dehexlifying a buffer." :type 'string :group 'hexl) (defcustom hexl-iso "" "If your Emacs can handle ISO characters, this should be set to \"-iso\" otherwise it should be \"\"." :type 'string :group 'hexl) (defcustom hexl-options (format "-hex %s" hexl-iso) "Space separated options to `hexl-program' that suit your needs. Quoting cannot be used, so the arguments cannot themselves contain spaces." :type 'string :group 'hexl) (defcustom hexl-follow-ascii t "If non-nil then highlight the ASCII character corresponding to point." :type 'boolean :group 'hexl :version "20.3") (defcustom hexl-mode-hook '(hexl-follow-line hexl-activate-ruler) "Normal hook run when entering Hexl mode." :type 'hook :options '(hexl-follow-line hexl-activate-ruler turn-on-eldoc-mode) :group 'hexl) (defface hexl-address-region '((t (:inherit header-line))) "Face used in address area of hexl-mode buffer." :group 'hexl) (defface hexl-ascii-region '((t (:inherit header-line))) "Face used in ascii area of hexl-mode buffer." :group 'hexl) (defvar hexl-max-address 0 "Maximum offset into hexl buffer.") (defvar hexl-mode-map nil) ;; Variable declarations for suppressing warnings from the byte-compiler. (defvar ruler-mode) (defvar ruler-mode-ruler-function) (defvar hl-line-mode) (defvar hl-line-range-function) (defvar hl-line-face) ;; Variables where the original values are stored to. (defvar hexl-mode-old-hl-line-mode) (defvar hexl-mode-old-hl-line-range-function) (defvar hexl-mode-old-hl-line-face) (defvar hexl-mode-old-local-map) (defvar hexl-mode-old-mode-name) (defvar hexl-mode-old-major-mode) (defvar hexl-mode-old-ruler-mode) (defvar hexl-mode-old-ruler-function) (defvar hexl-mode-old-isearch-search-fun-function) (defvar hexl-mode-old-require-final-newline) (defvar hexl-mode-old-syntax-table) (defvar hexl-mode-old-font-lock-keywords) (defvar hexl-mode-old-eldoc-documentation-function) (defvar hexl-ascii-overlay nil "Overlay used to highlight ASCII element corresponding to current point.") (make-variable-buffer-local 'hexl-ascii-overlay) (defvar hexl-font-lock-keywords '(("^\\([0-9a-f]+:\\).\\{40\\} \\(.+$\\)" ;; "^\\([0-9a-f]+:\\).+ \\(.+$\\)" (1 'hexl-address-region t t) (2 'hexl-ascii-region t t))) "Font lock keywords used in `hexl-mode'.") ;; routines (put 'hexl-mode 'mode-class 'special) ;;;###autoload (defun hexl-mode (&optional arg) "\\<hexl-mode-map>A mode for editing binary files in hex dump format. This is not an ordinary major mode; it alters some aspects of the current mode's behavior, but not all; also, you can exit Hexl mode and return to the previous mode using `hexl-mode-exit'. This function automatically converts a buffer into the hexl format using the function `hexlify-buffer'. Each line in the buffer has an \"address\" (displayed in hexadecimal) representing the offset into the file that the characters on this line are at and 16 characters from the file (displayed as hexadecimal values grouped every 16 bits) and as their ASCII values. If any of the characters (displayed as ASCII characters) are unprintable (control or meta characters) they will be replaced as periods. If `hexl-mode' is invoked with an argument the buffer is assumed to be in hexl format. A sample format: HEX ADDR: 0001 0203 0405 0607 0809 0a0b 0c0d 0e0f ASCII-TEXT -------- ---- ---- ---- ---- ---- ---- ---- ---- ---------------- 00000000: 5468 6973 2069 7320 6865 786c 2d6d 6f64 This is hexl-mod 00000010: 652e 2020 4561 6368 206c 696e 6520 7265 e. Each line re 00000020: 7072 6573 656e 7473 2031 3620 6279 7465 presents 16 byte 00000030: 7320 6173 2068 6578 6164 6563 696d 616c s as hexadecimal 00000040: 2041 5343 4949 0a61 6e64 2070 7269 6e74 ASCII.and print 00000050: 6162 6c65 2041 5343 4949 2063 6861 7261 able ASCII chara 00000060: 6374 6572 732e 2020 416e 7920 636f 6e74 cters. Any cont 00000070: 726f 6c20 6f72 206e 6f6e 2d41 5343 4949 rol or non-ASCII 00000080: 2063 6861 7261 6374 6572 730a 6172 6520 characters.are 00000090: 6469 7370 6c61 7965 6420 6173 2070 6572 displayed as per 000000a0: 696f 6473 2069 6e20 7468 6520 7072 696e iods in the prin 000000b0: 7461 626c 6520 6368 6172 6163 7465 7220 table character 000000c0: 7265 6769 6f6e 2e0a region.. Movement is as simple as movement in a normal Emacs text buffer. Most cursor movement bindings are the same (ie. Use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line] to move the cursor left, right, down, and up). Advanced cursor movement commands (ala \\[hexl-beginning-of-line], \\[hexl-end-of-line], \\[hexl-beginning-of-buffer], and \\[hexl-end-of-buffer]) are also supported. There are several ways to change text in hexl mode: ASCII characters (character between space (0x20) and tilde (0x7E)) are bound to self-insert so you can simply type the character and it will insert itself (actually overstrike) into the buffer. \\[hexl-quoted-insert] followed by another keystroke allows you to insert the key even if it isn't bound to self-insert. An octal number can be supplied in place of another key to insert the octal number's ASCII representation. \\[hexl-insert-hex-char] will insert a given hexadecimal value (if it is between 0 and 0xFF) into the buffer at the current point. \\[hexl-insert-octal-char] will insert a given octal value (if it is between 0 and 0377) into the buffer at the current point. \\[hexl-insert-decimal-char] will insert a given decimal value (if it is between 0 and 255) into the buffer at the current point. \\[hexl-mode-exit] will exit hexl-mode. Note: saving the file with any of the usual Emacs commands will actually convert it back to binary format while saving. You can use \\[hexl-find-file] to visit a file in Hexl mode. \\[describe-bindings] for advanced commands." (interactive "p") (unless (eq major-mode 'hexl-mode) (let ((modified (buffer-modified-p)) (inhibit-read-only t) (original-point (- (point) (point-min)))) (and (eobp) (not (bobp)) (setq original-point (1- original-point))) ;; If `hexl-mode' is invoked with an argument the buffer is assumed to ;; be in hexl format. (when (memq arg '(1 nil)) ;; If the buffer's EOL type is -dos, we need to account for ;; extra CR characters added when hexlify-buffer writes the ;; buffer to a file. ;; FIXME: This doesn't take into account multibyte coding systems. (when (eq (coding-system-eol-type buffer-file-coding-system) 1) (setq original-point (+ (count-lines (point-min) (point)) original-point)) (or (bolp) (setq original-point (1- original-point)))) (hexlify-buffer) (restore-buffer-modified-p modified)) (set (make-local-variable 'hexl-max-address) (let* ((full-lines (/ (buffer-size) 68)) (last-line (% (buffer-size) 68)) (last-line-bytes (% last-line 52))) (+ last-line-bytes (* full-lines 16) -1))) (condition-case nil (hexl-goto-address original-point) (error nil))) ;; We do not turn off the old major mode; instead we just ;; override most of it. That way, we can restore it perfectly. (make-local-variable 'hexl-mode-old-local-map) (setq hexl-mode-old-local-map (current-local-map)) (use-local-map hexl-mode-map) (make-local-variable 'hexl-mode-old-mode-name) (setq hexl-mode-old-mode-name mode-name) (setq mode-name "Hexl") (set (make-local-variable 'hexl-mode-old-isearch-search-fun-function) isearch-search-fun-function) (set (make-local-variable 'isearch-search-fun-function) 'hexl-isearch-search-function) (make-local-variable 'hexl-mode-old-major-mode) (setq hexl-mode-old-major-mode major-mode) (setq major-mode 'hexl-mode) (make-local-variable 'hexl-mode-old-ruler-mode) (setq hexl-mode-old-ruler-mode (and (boundp 'ruler-mode) ruler-mode)) (make-local-variable 'hexl-mode-old-hl-line-mode) (setq hexl-mode-old-hl-line-mode (and (boundp 'hl-line-mode) hl-line-mode)) (make-local-variable 'hexl-mode-old-syntax-table) (setq hexl-mode-old-syntax-table (syntax-table)) (set-syntax-table (standard-syntax-table)) (add-hook 'write-contents-functions 'hexl-save-buffer nil t) (make-local-variable 'hexl-mode-old-require-final-newline) (setq hexl-mode-old-require-final-newline require-final-newline) (make-local-variable 'require-final-newline) (setq require-final-newline nil) (make-local-variable 'hexl-mode-old-font-lock-keywords) (setq hexl-mode-old-font-lock-keywords font-lock-defaults) (setq font-lock-defaults '(hexl-font-lock-keywords t)) ;; Add hooks to rehexlify or dehexlify on various events. (add-hook 'before-revert-hook 'hexl-before-revert-hook nil t) (add-hook 'after-revert-hook 'hexl-after-revert-hook nil t) (add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer nil t) ;; Set a callback function for eldoc. (make-local-variable 'hexl-mode-old-eldoc-documentation-function) (setq hexl-mode-old-eldoc-documentation-function (bound-and-true-p eldoc-documentation-function)) (set (make-local-variable 'eldoc-documentation-function) 'hexl-print-current-point-info) (eldoc-add-command-completions "hexl-") (eldoc-remove-command "hexl-save-buffer" "hexl-current-address") (if hexl-follow-ascii (hexl-follow-ascii 1))) (run-mode-hooks 'hexl-mode-hook)) (defun hexl-isearch-search-function () (if (and (not isearch-regexp) (not isearch-word)) (lambda (string &optional bound noerror count) (funcall (if isearch-forward 're-search-forward 're-search-backward) (let ((textre (if (> (length string) 80) (regexp-quote string) (mapconcat (lambda (c) (regexp-quote (string c))) string "\\(?:\n\\(?:[:a-f0-9]+ \\)+ \\)?")))) (if (string-match "\\` ?\\([a-f0-9]+ \\)*[a-f0-9]+ ?\\'" string) (concat textre "\\|" (mapconcat 'regexp-quote (split-string string " ") " \\(?: .+\n[a-f0-9]+: \\)?")) textre)) bound noerror count)) (let ((isearch-search-fun-function nil)) (isearch-search-fun)))) (defun hexl-before-revert-hook () (remove-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer t)) (defun hexl-after-revert-hook () (hexl-mode)) (defvar hexl-in-save-buffer nil) (defun hexl-save-buffer () "Save a hexl format buffer as binary in visited file if modified." (interactive) (if hexl-in-save-buffer nil (restore-buffer-modified-p (if (buffer-modified-p) (let ((buf (generate-new-buffer " hexl")) (name (buffer-name)) (start (point-min)) (end (point-max)) modified) (with-current-buffer buf (insert-buffer-substring name start end) (set-buffer name) (dehexlify-buffer) ;; Prevent infinite recursion. (let ((hexl-in-save-buffer t)) (save-buffer)) (setq modified (buffer-modified-p)) (delete-region (point-min) (point-max)) (insert-buffer-substring buf start end) (kill-buffer buf) modified)) (message "(No changes need to be saved)") nil)) ;; Return t to indicate we have saved t t)) ;;;###autoload (defun hexl-find-file (filename) "Edit file FILENAME as a binary file in hex dump format. Switch to a buffer visiting file FILENAME, creating one if none exists, and edit the file in `hexl-mode'." (interactive (list (let ((completion-ignored-extensions nil)) (read-file-name "Filename: " nil nil 'ret-must-match)))) ;; Ignore the user's setting of default major-mode. (letf (((default-value 'major-mode) 'fundamental-mode)) (find-file-literally filename)) (if (not (eq major-mode 'hexl-mode)) (hexl-mode))) (defun hexl-mode-exit (&optional arg) "Exit Hexl mode, returning to previous mode. With arg, don't unhexlify buffer." (interactive "p") (if (or (eq arg 1) (not arg)) (let ((modified (buffer-modified-p)) (inhibit-read-only t) (original-point (1+ (hexl-current-address)))) (dehexlify-buffer) (remove-hook 'write-contents-functions 'hexl-save-buffer t) (restore-buffer-modified-p modified) (goto-char original-point) ;; Maybe adjust point for the removed CR characters. (when (eq (coding-system-eol-type buffer-file-coding-system) 1) (setq original-point (- original-point (count-lines (point-min) (point)))) (or (bobp) (setq original-point (1+ original-point)))) (goto-char original-point))) (remove-hook 'before-revert-hook 'hexl-before-revert-hook t) (remove-hook 'after-revert-hook 'hexl-after-revert-hook t) (remove-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer t) (remove-hook 'post-command-hook 'hexl-follow-ascii-find t) (setq hexl-ascii-overlay nil) (if (and (boundp 'ruler-mode) ruler-mode (not hexl-mode-old-ruler-mode)) (ruler-mode 0)) (when (boundp 'hexl-mode-old-ruler-function) (setq ruler-mode-ruler-function hexl-mode-old-ruler-function)) (if (and (boundp 'hl-line-mode) hl-line-mode (not hexl-mode-old-hl-line-mode)) (hl-line-mode 0)) (when (boundp 'hexl-mode-old-hl-line-range-function) (setq hl-line-range-function hexl-mode-old-hl-line-range-function)) (when (boundp 'hexl-mode-old-hl-line-face) (setq hl-line-face hexl-mode-old-hl-line-face)) (when (boundp 'hexl-mode-old-eldoc-documentation-function) (setq eldoc-documentation-function hexl-mode-old-eldoc-documentation-function)) (setq require-final-newline hexl-mode-old-require-final-newline) (setq mode-name hexl-mode-old-mode-name) (setq isearch-search-fun-function hexl-mode-old-isearch-search-fun-function) (use-local-map hexl-mode-old-local-map) (set-syntax-table hexl-mode-old-syntax-table) (setq font-lock-defaults hexl-mode-old-font-lock-keywords) (setq major-mode hexl-mode-old-major-mode) (force-mode-line-update)) (defun hexl-maybe-dehexlify-buffer () "Convert a hexl format buffer to binary. Ask the user for confirmation." (if (y-or-n-p "Convert contents back to binary format? ") (let ((modified (buffer-modified-p)) (inhibit-read-only t) (original-point (1+ (hexl-current-address)))) (dehexlify-buffer) (remove-hook 'write-contents-functions 'hexl-save-buffer t) (restore-buffer-modified-p modified) (goto-char original-point)))) (defun hexl-current-address (&optional validate) "Return current hexl-address." (interactive) (let ((current-column (- (% (- (point) (point-min) -1) 68) 11)) (hexl-address 0)) (if (< current-column 0) (if validate (error "Point is not on a character in the file") (setq current-column 0))) (setq hexl-address (+ (* (/ (- (point) (point-min) -1) 68) 16) (if (>= current-column 41) (- current-column 41) (/ (- current-column (/ current-column 5)) 2)))) (when (called-interactively-p 'interactive) (message "Current address is %d/0x%08x" hexl-address hexl-address)) hexl-address)) (defun hexl-print-current-point-info () "Return current hexl-address in string. This function is intended to be used as eldoc callback." (let ((addr (hexl-current-address))) (format "Current address is %d/0x%08x" addr addr))) (defun hexl-address-to-marker (address) "Return buffer position for ADDRESS." (interactive "nAddress: ") (+ (* (/ address 16) 68) 10 (point-min) (/ (* (% address 16) 5) 2))) (defun hexl-goto-address (address) "Go to hexl-mode (decimal) address ADDRESS. Signal error if ADDRESS is out of range." (interactive "nAddress: ") (if (or (< address 0) (> address hexl-max-address)) (error "Out of hexl region")) (goto-char (hexl-address-to-marker address))) (defun hexl-goto-hex-address (hex-address) "Go to hexl-mode address (hex string) HEX-ADDRESS. Signal error if HEX-ADDRESS is out of range." (interactive "sHex Address: ") (hexl-goto-address (hexl-hex-string-to-integer hex-address))) (defun hexl-hex-string-to-integer (hex-string) "Return decimal integer for HEX-STRING." (interactive "sHex number: ") (let ((hex-num 0)) (while (not (equal hex-string "")) (setq hex-num (+ (* hex-num 16) (hexl-hex-char-to-integer (string-to-char hex-string)))) (setq hex-string (substring hex-string 1))) hex-num)) (defun hexl-octal-string-to-integer (octal-string) "Return decimal integer for OCTAL-STRING." (interactive "sOctal number: ") (let ((oct-num 0)) (while (not (equal octal-string "")) (setq oct-num (+ (* oct-num 8) (hexl-oct-char-to-integer (string-to-char octal-string)))) (setq octal-string (substring octal-string 1))) oct-num)) ;; move point functions (defun hexl-backward-char (arg) "Move to left ARG bytes (right if ARG negative) in hexl-mode." (interactive "p") (hexl-goto-address (- (hexl-current-address) arg))) (defun hexl-forward-char (arg) "Move to right ARG bytes (left if ARG negative) in hexl-mode." (interactive "p") (hexl-goto-address (+ (hexl-current-address) arg))) (defun hexl-backward-short (arg) "Move to left ARG shorts (right if ARG negative) in hexl-mode." (interactive "p") (hexl-goto-address (let ((address (hexl-current-address))) (if (< arg 0) (progn (setq arg (- arg)) (while (> arg 0) (if (not (equal address (logior address 3))) (if (> address hexl-max-address) (progn (message "End of buffer.") (setq address hexl-max-address)) (setq address (logior address 3))) (if (> address hexl-max-address) (progn (message "End of buffer.") (setq address hexl-max-address)) (setq address (+ address 4)))) (setq arg (1- arg))) (if (> address hexl-max-address) (progn (message "End of buffer.") (setq address hexl-max-address)) (setq address (logior address 3)))) (while (> arg 0) (if (not (equal address (logand address -4))) (setq address (logand address -4)) (if (not (equal address 0)) (setq address (- address 4)) (message "Beginning of buffer."))) (setq arg (1- arg)))) address))) (defun hexl-forward-short (arg) "Move to right ARG shorts (left if ARG negative) in hexl-mode." (interactive "p") (hexl-backward-short (- arg))) (defun hexl-backward-word (arg) "Move to left ARG words (right if ARG negative) in hexl-mode." (interactive "p") (hexl-goto-address (let ((address (hexl-current-address))) (if (< arg 0) (progn (setq arg (- arg)) (while (> arg 0) (if (not (equal address (logior address 7))) (if (> address hexl-max-address) (progn (message "End of buffer.") (setq address hexl-max-address)) (setq address (logior address 7))) (if (> address hexl-max-address) (progn (message "End of buffer.") (setq address hexl-max-address)) (setq address (+ address 8)))) (setq arg (1- arg))) (if (> address hexl-max-address) (progn (message "End of buffer.") (setq address hexl-max-address)) (setq address (logior address 7)))) (while (> arg 0) (if (not (equal address (logand address -8))) (setq address (logand address -8)) (if (not (equal address 0)) (setq address (- address 8)) (message "Beginning of buffer."))) (setq arg (1- arg)))) address))) (defun hexl-forward-word (arg) "Move to right ARG words (left if ARG negative) in hexl-mode." (interactive "p") (hexl-backward-word (- arg))) (defun hexl-previous-line (arg) "Move vertically up ARG lines [16 bytes] (down if ARG negative) in hexl-mode. If there is no byte at the target address move to the last byte in that line." (interactive "p") (hexl-next-line (- arg))) (defun hexl-next-line (arg) "Move vertically down ARG lines [16 bytes] (up if ARG negative) in hexl-mode. If there is no byte at the target address move to the last byte in that line." (interactive "p") (hexl-goto-address (let ((address (+ (hexl-current-address) (* arg 16)))) (if (and (< arg 0) (< address 0)) (progn (message "Out of hexl region.") (setq address (% (hexl-current-address) 16))) (if (and (> address hexl-max-address) (< (% hexl-max-address 16) (% address 16))) (setq address hexl-max-address) (if (> address hexl-max-address) (progn (message "Out of hexl region.") (setq address (+ (logand hexl-max-address -16) (% (hexl-current-address) 16))))))) address))) (defun hexl-beginning-of-buffer (arg) "Move to the beginning of the hexl buffer. Leaves `hexl-mark' at previous position. With prefix arg N, puts point N bytes of the way from the true beginning." (interactive "p") (push-mark (point)) (hexl-goto-address (+ 0 (1- arg)))) (defun hexl-end-of-buffer (arg) "Go to `hexl-max-address' minus ARG." (interactive "p") (push-mark (point)) (hexl-goto-address (- hexl-max-address (1- arg)))) (defun hexl-beginning-of-line () "Goto beginning of line in hexl mode." (interactive) (goto-char (+ (* (/ (point) 68) 68) 11))) (defun hexl-end-of-line () "Goto end of line in hexl mode." (interactive) (hexl-goto-address (let ((address (logior (hexl-current-address) 15))) (if (> address hexl-max-address) (setq address hexl-max-address)) address))) (defun hexl-scroll-down (arg) "Scroll hexl buffer window upward ARG lines; or near full window if no ARG." (interactive "P") (if (null arg) (setq arg (1- (window-height))) (setq arg (prefix-numeric-value arg))) (hexl-scroll-up (- arg))) (defun hexl-scroll-up (arg) "Scroll hexl buffer window upward ARG lines; or near full window if no ARG. If there's no byte at the target address, move to the first or last line." (interactive "P") (if (null arg) (setq arg (1- (window-height))) (setq arg (prefix-numeric-value arg))) (let* ((movement (* arg 16)) (address (hexl-current-address)) (dest (+ address movement))) (cond ;; If possible, try to stay at the same offset from the beginning ;; of the 16-byte group, even if we move to the first or last ;; group. ((and (> dest hexl-max-address) (>= (% hexl-max-address 16) (% address 16))) (setq dest (+ (logand hexl-max-address -16) (% address 16)))) ((> dest hexl-max-address) (setq dest hexl-max-address)) ((< dest 0) (setq dest (% address 16)))) (if (/= dest (+ address movement)) (message "Out of hexl region.")) (hexl-goto-address dest) (recenter 0))) (defun hexl-beginning-of-1k-page () "Go to beginning of 1KB boundary." (interactive) (hexl-goto-address (logand (hexl-current-address) -1024))) (defun hexl-end-of-1k-page () "Go to end of 1KB boundary." (interactive) (hexl-goto-address (let ((address (logior (hexl-current-address) 1023))) (if (> address hexl-max-address) (setq address hexl-max-address)) address))) (defun hexl-beginning-of-512b-page () "Go to beginning of 512 byte boundary." (interactive) (hexl-goto-address (logand (hexl-current-address) -512))) (defun hexl-end-of-512b-page () "Go to end of 512 byte boundary." (interactive) (hexl-goto-address (let ((address (logior (hexl-current-address) 511))) (if (> address hexl-max-address) (setq address hexl-max-address)) address))) (defun hexl-quoted-insert (arg) "Read next input character and insert it. Useful for inserting control characters and non-ASCII characters given their numerical code. You may also type octal digits, to insert a character with that code." (interactive "p") (hexl-insert-multibyte-char (read-quoted-char) arg)) ;00000000: 0011 2233 4455 6677 8899 aabb ccdd eeff 0123456789ABCDEF ;;;###autoload (defun hexlify-buffer () "Convert a binary buffer to hexl format. This discards the buffer's undo information." (interactive) (and (consp buffer-undo-list) (or (y-or-n-p "Converting to hexl format discards undo info; ok? ") (error "Aborted")) (setq buffer-undo-list nil)) ;; Don't decode text in the ASCII part of `hexl' program output. (let ((coding-system-for-read 'raw-text) (coding-system-for-write buffer-file-coding-system) (buffer-undo-list t)) (apply 'call-process-region (point-min) (point-max) (expand-file-name hexl-program exec-directory) t t nil ;; Manually encode the args, otherwise they're encoded using ;; coding-system-for-write (i.e. buffer-file-coding-system) which ;; may not be what we want (e.g. utf-16 on a non-utf-16 system). (mapcar (lambda (s) (if (not (multibyte-string-p s)) s (encode-coding-string s locale-coding-system))) (split-string hexl-options))) (if (> (point) (hexl-address-to-marker hexl-max-address)) (hexl-goto-address hexl-max-address)))) (defun dehexlify-buffer () "Convert a hexl format buffer to binary. This discards the buffer's undo information." (interactive) (and (consp buffer-undo-list) (or (y-or-n-p "Converting from hexl format discards undo info; ok? ") (error "Aborted")) (setq buffer-undo-list nil)) (let ((coding-system-for-write 'raw-text) (coding-system-for-read buffer-file-coding-system) (buffer-undo-list t)) (apply 'call-process-region (point-min) (point-max) (expand-file-name hexl-program exec-directory) t t nil "-de" (split-string hexl-options)))) (defun hexl-char-after-point () "Return char for ASCII hex digits at point." (hexl-htoi (char-after (point)) (char-after (1+ (point))))) (defun hexl-htoi (lh rh) "Hex (char) LH (char) RH to integer." (+ (* (hexl-hex-char-to-integer lh) 16) (hexl-hex-char-to-integer rh))) (defun hexl-hex-char-to-integer (character) "Take a char and return its value as if it was a hex digit." (if (and (>= character ?0) (<= character ?9)) (- character ?0) (let ((ch (logior character 32))) (if (and (>= ch ?a) (<= ch ?f)) (- ch (- ?a 10)) (error "Invalid hex digit `%c'" ch))))) (defun hexl-oct-char-to-integer (character) "Take a char and return its value as if it was a octal digit." (if (and (>= character ?0) (<= character ?7)) (- character ?0) (error "Invalid octal digit `%c'" character))) (defun hexl-printable-character (ch) "Return a displayable string for character CH." (format "%c" (if hexl-iso (if (or (< ch 32) (and (>= ch 127) (< ch 160))) 46 ch) (if (or (< ch 32) (>= ch 127)) 46 ch)))) (defun hexl-insert-multibyte-char (ch num) "Insert a possibly multibyte character CH NUM times. Non-ASCII characters are first encoded with `buffer-file-coding-system', and their encoded form is inserted byte by byte." (let ((charset (char-charset ch)) (coding (if (or (null buffer-file-coding-system) ;; coding-system-type equals t means undecided. (eq (coding-system-type buffer-file-coding-system) t)) (default-value 'buffer-file-coding-system) buffer-file-coding-system))) (cond ((and (> ch 0) (< ch 256)) (hexl-insert-char ch num)) ((eq charset 'unknown) (error "0x%x -- invalid character code; use \\[hexl-insert-hex-string]" ch)) (t (let ((encoded (encode-coding-char ch coding)) (internal (string-as-unibyte (char-to-string ch))) internal-hex) ;; If encode-coding-char returns nil, it means our character ;; cannot be safely encoded with buffer-file-coding-system. ;; In that case, we offer to insert the internal representation ;; of that character, byte by byte. (when (null encoded) (setq internal-hex (mapconcat (function (lambda (c) (format "%x" c))) internal " ")) (if (yes-or-no-p (format "Insert char 0x%x's internal representation \"%s\"? " ch internal-hex)) (setq encoded internal) (error "Can't encode `0x%x' with this buffer's coding system; try \\[hexl-insert-hex-string]" ch))) (while (> num 0) (mapc (function (lambda (c) (hexl-insert-char c 1))) encoded) (setq num (1- num)))))))) (defun hexl-self-insert-command (arg) "Insert this character. Interactively, with a numeric argument, insert this character that many times. Non-ASCII characters are first encoded with `buffer-file-coding-system', and their encoded form is inserted byte by byte." (interactive "p") (hexl-insert-multibyte-char last-command-event arg)) (defun hexl-insert-char (ch num) "Insert the character CH NUM times in a hexl buffer. CH must be a unibyte character whose value is between 0 and 255." (if (or (< ch 0) (> ch 255)) (error "Invalid character 0x%x -- must be in the range [0..255]" ch)) (let ((address (hexl-current-address t))) (while (> num 0) (let ((hex-position (+ (* (/ address 16) 68) 10 (point-min) (* 2 (% address 16)) (/ (% address 16) 2))) (ascii-position (+ (* (/ address 16) 68) 51 (point-min) (% address 16))) at-ascii-position) (if (= (point) ascii-position) (setq at-ascii-position t)) (goto-char hex-position) (delete-char 2) (insert (format "%02x" ch)) (goto-char ascii-position) (delete-char 1) (insert (hexl-printable-character ch)) (or (eq address hexl-max-address) (setq address (1+ address))) (hexl-goto-address address) (if at-ascii-position (progn (beginning-of-line) (forward-char 51) (forward-char (% address 16))))) (setq num (1- num))))) ;; hex conversion (defun hexl-insert-hex-char (arg) "Insert a character given by its hexadecimal code ARG times at point." (interactive "p") (let ((num (hexl-hex-string-to-integer (read-string "Hex number: ")))) (if (< num 0) (error "Hex number out of range") (hexl-insert-multibyte-char num arg)))) (defun hexl-insert-hex-string (str arg) "Insert hexadecimal string STR at point ARG times. Embedded whitespace, dashes, and periods in the string are ignored." (interactive "sHex string: \np") (setq str (replace-regexp-in-string "[- \t.]" "" str)) (let ((chars '())) (let ((len (length str)) (idx 0)) (if (eq (logand len 1) 1) (let ((num (hexl-hex-string-to-integer (substring str 0 1)))) (setq chars (cons num chars)) (setq idx 1))) (while (< idx len) (let* ((nidx (+ idx 2)) (num (hexl-hex-string-to-integer (substring str idx nidx)))) (setq chars (cons num chars)) (setq idx nidx)))) (setq chars (nreverse chars)) (while (> arg 0) (let ((chars chars)) (while chars (hexl-insert-char (car chars) 1) (setq chars (cdr chars)))) (setq arg (- arg 1))))) (defun hexl-insert-decimal-char (arg) "Insert a character given by its decimal code ARG times at point." (interactive "p") (let ((num (string-to-number (read-string "Decimal Number: ")))) (if (< num 0) (error "Decimal number out of range") (hexl-insert-multibyte-char num arg)))) (defun hexl-insert-octal-char (arg) "Insert a character given by its octal code ARG times at point." (interactive "p") (let ((num (hexl-octal-string-to-integer (read-string "Octal Number: ")))) (if (< num 0) (error "Decimal number out of range") (hexl-insert-multibyte-char num arg)))) (defun hexl-follow-ascii (&optional arg) "Toggle following ASCII in Hexl buffers. With prefix ARG, turn on following if and only if ARG is positive. When following is enabled, the ASCII character corresponding to the element under the point is highlighted. Customize the variable `hexl-follow-ascii' to disable this feature." (interactive "P") (let ((on-p (if arg (> (prefix-numeric-value arg) 0) (not hexl-ascii-overlay)))) (if on-p ;; turn it on (if (not hexl-ascii-overlay) (progn (setq hexl-ascii-overlay (make-overlay 1 1) hexl-follow-ascii t) (overlay-put hexl-ascii-overlay 'face 'highlight) (add-hook 'post-command-hook 'hexl-follow-ascii-find nil t))) ;; turn it off (if hexl-ascii-overlay (progn (delete-overlay hexl-ascii-overlay) (setq hexl-ascii-overlay nil hexl-follow-ascii nil) (remove-hook 'post-command-hook 'hexl-follow-ascii-find t) ))))) (defun hexl-activate-ruler () "Activate `ruler-mode'." (require 'ruler-mode) (unless (boundp 'hexl-mode-old-ruler-function) (set (make-local-variable 'hexl-mode-old-ruler-function) ruler-mode-ruler-function)) (set (make-local-variable 'ruler-mode-ruler-function) 'hexl-mode-ruler) (ruler-mode 1)) (defun hexl-follow-line () "Activate `hl-line-mode'." (require 'hl-line) (unless (boundp 'hexl-mode-old-hl-line-range-function) (set (make-local-variable 'hexl-mode-old-hl-line-range-function) hl-line-range-function)) (unless (boundp 'hexl-mode-old-hl-line-face) (set (make-local-variable 'hexl-mode-old-hl-line-face) hl-line-face)) (set (make-local-variable 'hl-line-range-function) 'hexl-highlight-line-range) (set (make-local-variable 'hl-line-face) 'highlight) (hl-line-mode 1)) (defun hexl-highlight-line-range () "Return the range of address region for the point. This function is assumed to be used as callback function for `hl-line-mode'." (cons (line-beginning-position) ;; 9 stands for (length "87654321:") (+ (line-beginning-position) 9))) (defun hexl-follow-ascii-find () "Find and highlight the ASCII element corresponding to current point." (let ((pos (+ 51 (- (point) (current-column)) (mod (hexl-current-address) 16)))) (move-overlay hexl-ascii-overlay pos (1+ pos)) )) (defun hexl-mode-ruler () "Return a string ruler for hexl mode." (let* ((highlight (mod (hexl-current-address) 16)) (s " 87654321 0011 2233 4455 6677 8899 aabb ccdd eeff 0123456789abcdef") (pos 0)) (set-text-properties 0 (length s) nil s) ;; Turn spaces in the header into stretch specs so they work ;; regardless of the header-line face. (while (string-match "[ \t]+" s pos) (setq pos (match-end 0)) (put-text-property (match-beginning 0) pos 'display ;; Assume fixed-size chars `(space :align-to ,(1- pos)) s)) ;; Highlight the current column. (put-text-property (+ 11 (/ (* 5 highlight) 2)) (+ 13 (/ (* 5 highlight) 2)) 'face 'highlight s) ;; Highlight the current ascii column (put-text-property (+ 13 39 highlight) (+ 13 40 highlight) 'face 'highlight s) s)) ;; startup stuff. (if hexl-mode-map nil (setq hexl-mode-map (make-keymap)) ;; Make all self-inserting keys go through hexl-self-insert-command, ;; because we need to convert them to unibyte characters before ;; inserting them into the buffer. (define-key hexl-mode-map [remap self-insert-command] 'hexl-self-insert-command) (define-key hexl-mode-map "\C-m" 'hexl-self-insert-command) (define-key hexl-mode-map [left] 'hexl-backward-char) (define-key hexl-mode-map [right] 'hexl-forward-char) (define-key hexl-mode-map [up] 'hexl-previous-line) (define-key hexl-mode-map [down] 'hexl-next-line) (define-key hexl-mode-map [M-left] 'hexl-backward-short) (define-key hexl-mode-map [?\e left] 'hexl-backward-short) (define-key hexl-mode-map [M-right] 'hexl-forward-short) (define-key hexl-mode-map [?\e right] 'hexl-forward-short) (define-key hexl-mode-map [next] 'hexl-scroll-up) (define-key hexl-mode-map [prior] 'hexl-scroll-down) (define-key hexl-mode-map [home] 'hexl-beginning-of-line) (define-key hexl-mode-map [end] 'hexl-end-of-line) (define-key hexl-mode-map [C-home] 'hexl-beginning-of-buffer) (define-key hexl-mode-map [C-end] 'hexl-end-of-buffer) (define-key hexl-mode-map [deletechar] 'undefined) (define-key hexl-mode-map [deleteline] 'undefined) (define-key hexl-mode-map [insertline] 'undefined) (define-key hexl-mode-map [S-delete] 'undefined) (define-key hexl-mode-map "\177" 'undefined) (define-key hexl-mode-map "\C-a" 'hexl-beginning-of-line) (define-key hexl-mode-map "\C-b" 'hexl-backward-char) (define-key hexl-mode-map "\C-d" 'undefined) (define-key hexl-mode-map "\C-e" 'hexl-end-of-line) (define-key hexl-mode-map "\C-f" 'hexl-forward-char) (if (not (memq (key-binding (char-to-string help-char)) '(help-command ehelp-command))) (define-key hexl-mode-map (char-to-string help-char) 'undefined)) (define-key hexl-mode-map "\C-k" 'undefined) (define-key hexl-mode-map "\C-n" 'hexl-next-line) (define-key hexl-mode-map "\C-o" 'undefined) (define-key hexl-mode-map "\C-p" 'hexl-previous-line) (define-key hexl-mode-map "\C-q" 'hexl-quoted-insert) (define-key hexl-mode-map "\C-t" 'undefined) (define-key hexl-mode-map "\C-v" 'hexl-scroll-up) (define-key hexl-mode-map "\C-w" 'undefined) (define-key hexl-mode-map "\C-y" 'undefined) (fset 'hexl-ESC-prefix (copy-keymap 'ESC-prefix)) (define-key hexl-mode-map "\e" 'hexl-ESC-prefix) (define-key hexl-mode-map "\e\C-a" 'hexl-beginning-of-512b-page) (define-key hexl-mode-map "\e\C-b" 'hexl-backward-short) (define-key hexl-mode-map "\e\C-d" 'hexl-insert-decimal-char) (define-key hexl-mode-map "\e\C-e" 'hexl-end-of-512b-page) (define-key hexl-mode-map "\e\C-f" 'hexl-forward-short) (define-key hexl-mode-map "\e\C-i" 'undefined) (define-key hexl-mode-map "\e\C-j" 'undefined) (define-key hexl-mode-map "\e\C-k" 'undefined) (define-key hexl-mode-map "\e\C-o" 'hexl-insert-octal-char) (define-key hexl-mode-map "\e\C-q" 'undefined) (define-key hexl-mode-map "\e\C-t" 'undefined) (define-key hexl-mode-map "\e\C-x" 'hexl-insert-hex-char) (define-key hexl-mode-map "\eb" 'hexl-backward-word) (define-key hexl-mode-map "\ec" 'undefined) (define-key hexl-mode-map "\ed" 'undefined) (define-key hexl-mode-map "\ef" 'hexl-forward-word) (define-key hexl-mode-map "\eg" 'hexl-goto-hex-address) (define-key hexl-mode-map "\ei" 'undefined) (define-key hexl-mode-map "\ej" 'hexl-goto-address) (define-key hexl-mode-map "\ek" 'undefined) (define-key hexl-mode-map "\el" 'undefined) (define-key hexl-mode-map "\eq" 'undefined) (define-key hexl-mode-map "\es" 'undefined) (define-key hexl-mode-map "\et" 'undefined) (define-key hexl-mode-map "\eu" 'undefined) (define-key hexl-mode-map "\ev" 'hexl-scroll-down) (define-key hexl-mode-map "\ey" 'undefined) (define-key hexl-mode-map "\ez" 'undefined) (define-key hexl-mode-map "\e<" 'hexl-beginning-of-buffer) (define-key hexl-mode-map "\e>" 'hexl-end-of-buffer) (fset 'hexl-C-c-prefix (copy-keymap mode-specific-map)) (define-key hexl-mode-map "\C-c" 'hexl-C-c-prefix) (define-key hexl-mode-map "\C-c\C-c" 'hexl-mode-exit) (fset 'hexl-C-x-prefix (copy-keymap 'Control-X-prefix)) (define-key hexl-mode-map "\C-x" 'hexl-C-x-prefix) (define-key hexl-mode-map "\C-x[" 'hexl-beginning-of-1k-page) (define-key hexl-mode-map "\C-x]" 'hexl-end-of-1k-page) (define-key hexl-mode-map "\C-x\C-p" 'undefined) (define-key hexl-mode-map "\C-x\C-s" 'hexl-save-buffer) (define-key hexl-mode-map "\C-x\C-t" 'undefined)) (easy-menu-define hexl-menu hexl-mode-map "Hexl Mode menu" `("Hexl" :help "Hexl-specific Features" ["Backward short" hexl-backward-short :help "Move to left a short"] ["Forward short" hexl-forward-short :help "Move to right a short"] ["Backward word" hexl-backward-short :help "Move to left a word"] ["Forward word" hexl-forward-short :help "Move to right a word"] "-" ["Beginning of 512b page" hexl-beginning-of-512b-page :help "Go to beginning of 512 byte boundary"] ["End of 512b page" hexl-end-of-512b-page :help "Go to end of 512 byte boundary"] ["Beginning of 1K page" hexl-beginning-of-1k-page :help "Go to beginning of 1KB boundary"] ["End of 1K page" hexl-end-of-1k-page :help "Go to end of 1KB boundary"] "-" ["Go to address" hexl-goto-address :help "Go to hexl-mode (decimal) address"] ["Go to address" hexl-goto-hex-address :help "Go to hexl-mode (hex string) address"] "-" ["Insert decimal char" hexl-insert-decimal-char :help "Insert a character given by its decimal code"] ["Insert hex char" hexl-insert-hex-char :help "Insert a character given by its hexadecimal code"] ["Insert octal char" hexl-insert-octal-char :help "Insert a character given by its octal code"] "-" ["Exit hexl mode" hexl-mode-exit :help "Exit hexl mode returning to previous mode"])) (provide 'hexl) ;; arch-tag: d5a7aa8a-9bce-480b-bcff-6c4c7ca5ea4a ;;; hexl.el ends here