summaryrefslogtreecommitdiff
path: root/lisp/version.el
Commit message (Collapse)AuthorAgeFilesLines
* Remove the build number from emacs-version variableGlenn Morris2017-02-171-1/+8
| | | | | | | | | | | | | | | It's a largely internal detail that can confuse users. (Bug#25590) * lisp/version.el (emacs-build-number): New constant. (emacs-version): Use emacs-build-number. * lisp/loadup.el (top-level): When dumping, increment emacs-build-number rather than emacs-version. * src/emacs.c (emacs-version): Doc fix. * doc/lispref/intro.texi (Version Info): Update emacs-version details. Mention emacs-build-number. * lisp/gnus/gnus-util.el (gnus-emacs-version): * lisp/mail/emacsbug.el (report-emacs-bug): * admin/admin.el (set-version): Update for emacs-version change. ; * etc/NEWS: Mention this.
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\ | | | | | | | | 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
| | | | | | | | Run admin/update-copyright.
* | Avoid delving into Git internals for versionPaul Eggert2016-06-011-57/+2
| | | | | | | | | | | | | | | | * lisp/loadup.el (exec-path): Set it to nil later, so that emacs-repository-get-version can invoke git commands in the PATH. * lisp/version.el (emacs-repository--version-git-1): Remove. (emacs-repository-get-version): Let Git do it rather than delving into Git internals.
* | Fix emacs-repository-get-version with packed .gitPaul Eggert2016-06-011-8/+17
| | | | | | | | | | | | | | * lisp/version.el (emacs-repository-get-version): Parse .git/packed-refs if it exists. Problem reported by Martin Rudalics in: http://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00554.html
* | Deterministic build improvementsPaul Eggert2016-03-021-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (BUILD_DETAILS): Rename from DETERMINISTIC_DUMP, and negate its sense. Use it via AC_SUBST, not AC_DEFINE, and have its value be either empty or --no-build-details. All uses changed. Change option to --disable-build-details. * doc/lispref/cmdargs.texi (Initial Options): Document --no-build-details. * doc/lispref/internals.texi (Building Emacs): * etc/NEWS: Document --disable-build-details. * doc/lispref/intro.texi (Version Info): Say that emacs-build-time can be nil. * lisp/erc/erc-compat.el (erc-emacs-build-time): Now nil if details are omitted. * lisp/erc/erc.el (erc-cmd-SV): * lisp/version.el (emacs-build-time): Now nil if no build details. (emacs-version): Output build time only if build details. * src/Makefile.in (BUILD_DETAILS): New macro. (temacs, bootstrap-emacs): Use it. * src/emacs.c (build_details): New var. (standard_args, main): Support --no-build-details. (Vdeterministic_dump): Remove; all uses replaced by !build_details. (syms_of_emacs): Set Vbuild_details to a boolean, not to a Lisp_Object. * src/lisp.h (build_details): New decl. * src/sysdep.c (init_system_name): When !build_details, set system-name to nil, not to "elided".
* | Remove build system name from deterministic dumpsPhilipp Stephani2016-03-021-3/+4
|/ | | | | | | | | | | | * configure.ac (DETERMINISTIC_DUMP): New configuration option. * lisp/version.el (emacs-build-time): Add a comment to make the build time deterministic if requested. (emacs-build-system): Make variable deterministic if requested. * src/emacs.c (main): Initialize `deterministic-dump' from the configuration option. (syms_of_emacs): New constant `deterministic-dump'. * src/sysdep.c (init_system_name): Use a constant if a deterministic dump is requested.
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
| | | | Run admin/update-copyright.
* Discover repository version in linked worktrees (bug#21930)Juanma Barranquero2015-11-201-23/+41
| | | | | | | * lisp/version.el (emacs-repository--version-git-1): Do not assume HEAD is at .git/HEAD, it can also be at .git/worktrees/<branch>/HEAD. (emacs-repository-get-version): Grok linked worktrees when EXTERNAL is nil too.
* * lisp/version.el (emacs-version): No longer include build hostGlenn Morris2015-08-241-4/+5
| | | | * doc/lispref/intro.texi (Version Info): Update example.
* * lisp/version.el (emacs-repository-version-git): Demote errors.Glenn Morris2015-06-141-3/+4
| | | | Check result is a hash.
* Tweaks for getting repository version; a bit more like it was for bzr.Glenn Morris2015-06-131-28/+41
| | | | | | | * lisp/version.el (emacs-repository-version-git) (emacs-repository--version-git-1): New functions, split from emacs-repository-get-version. (emacs-repository-get-version): Make the second argument meaningful.
* * lisp/version.el (emacs-repository-get-version):Glenn Morris2015-06-121-15/+29
| | | | Avoid calling external executable if possible. (Bug#20799)
* Address some compilation warnings.Glenn Morris2015-06-061-0/+1
| | | | | | | | | * lisp/international/mule-cmds.el (w32-get-console-codepage) (w32-get-console-output-codepage): * lisp/progmodes/elisp-mode.el (xref-collect-references): * lisp/version.el (cairo-version-string): Declare. * lisp/erc/erc.el (erc-nickname-in-use): Fix typo.
* Add cairo drawing.Jan D2015-02-111-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (with-cairo): New option. (USE_CAIRO): Default to yes for Gtk+ 3. Add code to test for cairo, set CAIRO_CFLAGS, CAIRO_LIBS. Add ftcrfonto to FONT_OBJ if cairo. Output "Does Emacs use cairo?". * lisp/version.el (emacs-version): Add cairo version. * src/Makefile.in (CAIRO_CFLAGS, CAIRO_LIBS): New variables. (FONT_OBJ): Add comment about ftcrfont. (ALL_CFLAGS): Add CAIRO_CFLAGS. (LIBES): Add CAIRO_LIBS. * src/dispextern.h (struct image): Add cr_data for cairo. (x_cr_init_fringe): Declare. * src/font.c (syms_of_font): Call syms_of_ftcrfont for cairo. * src/font.h (ftcrfont_driver, syms_of_ftcrfont): Declare * src/fringe.c (x_cr_init_fringe): New function name that shares code with w32_init_fringe. * src/ftcrfont.c: New font driver for cairo, based on the ftfont driver. * src/ftfont.c (ftfont_info_size); New global variable. (ftfont_open2): New extern function almost the same as old ftfont_open, but takes the font_object as argument. (ftfont_open): Build font object and call ftfont_open2. * src/ftfont.h (ftfont_open2, ftfont_info_size): Declare. * src/gtkutil.c (xg_clear_under_internal_border) (xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos): Only queue_draw if not cairo. Change args to x_clear_area. (xg_get_font): Use Qftcr when using cairo, Qxft otherwise. (xg_page_setup_dialog, xg_get_page_setup, draw_page) (xg_print_frames_dialog): New functions for printing. * src/gtkutil.h (xg_page_setup_dialog, xg_get_page_setup) (xg_print_frames_dialog): Declare. * src/image.c: Add defined (USE_CAIRO) for PNG. Add !defined USE_CAIRO for W32 PNG code. (x_clear_image): If cairo, destroy the surface in cr_data. (png_load): Add new cairo compatible implementation. (lookup_image_type): Add defined (USE_CAIRO) for define png_type. * src/xfns.c: New section Printing. (x-export-frames, x-page-setup-dialog, x-get-page-setup) (x-print-frames-dialog): New printing functions. (Fx_create_frame, x_create_tip_frame): Register ftcrfont if cairo. (syms_of_xfns): Defsym Qorientation, Qtop_margin, Qbottom_margin, Qportrait, Qlandscape, Qreverse_portrait, Qreverse_landscape). (syms_of_xfns): Provide cairo and defvar cairo-version-string. defsubr Sx_page_setup_dialog, Sx_get_page_setup, Sx_print_frames_dialog. * src/xterm.c (x_clear_area1, x_prepare_for_xlibdraw) (x_set_clip_rectangles, x_reset_clip_rectangles, x_fill_rectangle) (x_draw_rectangle, x_fill_trapezoid_for_relief, x_clear_window) (x_gc_get_ext_data, x_extension_initialize, x_cr_accumulate_data): Declare. (FRAME_CR_CONTEXT, FRAME_CR_SURFACE): New macros. (max_fringe_bmp, fringe_bmp): New variables. (x_gc_get_ext_data, x_extension_initialize) (x_cr_destroy_surface, x_begin_cr_clip, x_end_cr_clip) (x_set_cr_source_with_gc_foreground) (x_set_cr_source_with_gc_background, x_cr_define_fringe_bitmap) (x_cr_destroy_fringe_bitmap, x_cr_draw_image, x_cr_draw_frame) (x_cr_accumulate_data, x_cr_destroy, x_cr_export_frames) (x_prepare_for_xlibdraw, x_set_clip_rectangles) (x_reset_clip_rectangles, x_fill_rectangle, x_draw_rectangle) (x_clear_window, x_fill_trapezoid_for_relief): New functions. (x_update_begin): Create cairo surface if needed. (x_draw_vertical_window_border): Call x_fill_rectangle for cairo. (x_update_end): Paint cairo drawing surface to xlib surface. (x_clear_under_internal_border, x_after_update_window_line): Adjust arguments to x_clear_area. (x_draw_fringe_bitmap): Call x_fill_rectangle. Get GC values and call x_cr_draw_image for cairo. Call x_reset_clip_rectangles instead of XSetClipMask. (x_set_glyph_string_clipping) (x_set_glyph_string_clipping_exactly): Use x_set_clip_rectangles instead of XSetClipRectangles. (x_clear_glyph_string_rect, x_draw_glyph_string_background): Use x_fill_rectangle instead of XFillRectangle. (x_draw_glyph_string_foreground) (x_draw_composite_glyph_string_foreground) (x_draw_glyphless_glyph_string_foreground): Use x_draw_rectangle instead of XDrawRectangle. (x_draw_relief_rect): Add code for USE_CAIRO. Call x_reset_clip_rectangles instead of XSetClipMask. (x_draw_box_rect): x_set_clip_rectangles instead of XSetClipRectangles, x_fill_rectangle instead of XFillRectangle, x_reset_clip_rectangles instead of XSetClipMask. (x_draw_image_foreground, x_draw_image_foreground_1): x_draw_rectangle instead of XDrawRectangle. (x_draw_glyph_string_bg_rect): x_fill_rectangle instead of XFillRectangle. (x_draw_image_glyph_string): If img has cr_data, use it as a cairo surface. (x_draw_stretch_glyph_string): x_set_clip_rectangles instead of XSetClipRectangles, x_fill_rectangle instead of XFillRectangle. (x_draw_glyph_string): x_fill_rectangle instead of XFillRectangle., x_reset_clip_rectangles instead of XSetClipMask. (x_shift_glyphs_for_insert): Call x_prepare_for_xlibdraw. (x_clear_area1): New function that calls XClearArea. (x_clear_area): Takes frame as parameter, calls x_clear_area1 for non-cairo. (x_clear_frame): x_clear_window instead of XClearWindow. (x_scroll_run): Set frame garbaged if cairo. (XTmouse_position): Initialize *part to 0. (x_scroll_bar_create): Adjust arguments to x_clear_area. (x_scroll_bar_set_handle): x_clear_area1 instead of x_clear_area, x_fill_rectangle instead of XFillRectangle. (XTset_vertical_scroll_bar, XTset_horizontal_scroll_bar): Adjust arguments to x_clear_area. (x_scroll_bar_expose): x_draw_rectangle instead of XDrawRectangle. (handle_one_xevent): Adjust arguments to x_clear_area. Destroy cairo surface for frame if ConfigureNotify. (x_clip_to_row): x_set_clip_rectangles instead of XSetClipRectangles. (x_draw_hollow_cursor): x_draw_rectangle instead of XDrawRectangle, x_reset_clip_rectangles instead of XSetClipMask. (x_draw_bar_cursor): x_fill_rectangle instead of XFillRectangle, x_reset_clip_rectangles instead of XSetClipMask. (x_clear_frame_area): Adjust arguments to x_clear_area. (x_free_frame_resources): Call x_prepare_for_xlibdraw. (x_term_init): Call x_extension_initialize if cairo. (x_redisplay_interface): Add x_cr_define_fringe_bitmap, x_cr_destroy_fringe_bitmap for cairo. (x_initialize): Call x_cr_init_fringe for cairo. * src/xterm.h: Add include of cairo header files. (x_bitmap_record): Add img if cairo. (x_gc_ext_data): New struct for cairo. (x_display_info): Add ext_codes for cairo. (x_output): Add cr_context and cr_surface for cairo. (x_clear_area): Change arguments from Display*/Window to frame pointer. (x_query_color, x_begin_cr_clip, x_end_cr_clip) (x_set_cr_source_with_gc_foreground, x_set_cr_source_with_gc_background) (x_cr_draw_frame, x_cr_export_frames): Declare.
* Update docstring of emacs-repository-get-version.Ulrich Müller2015-01-171-4/+2
| | | | * version.el (emacs-repository-get-version): Update docstring.
* Discard the Bazaar case in repository version detectionUlrich Müller2015-01-171-72/+1
| | | | | | | | | | * version.el (emacs-bzr-version-dirstate, emacs-bzr-version-bzr): Remove. (emacs-repository-get-version): Discard the Bazaar case. * vc/vc-bzr.el (vc-bzr-version-dirstate): Rename from emacs-bzr-version-dirstate and move from version.el to here. (vc-bzr-working-revision): Use it.
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
| | | | Run admin/update-copyright.
* Use git rev-parse to get repository versionAndreas Schwab2014-11-161-2/+2
| | | | | * version.el (emacs-repository-get-version): Use git rev-parse instead of git log.
* (emacs-repository-get-version): Call `git log' with proper format argumentUlrich Müller2014-11-141-1/+1
| | | | | | | Fixes: debbugs:19049 * version.el (emacs-repository-get-version): Call `git log' command with proper format argument (bug#19049).
* Yet another change for git migration backported from trunk.Glenn Morris2014-10-311-2/+2
| | | | | lisp/version.el (emacs-bzr-version, emacs-bzr-get-version): Revert 2014-10-31 change.
* Backport from trunk more changes in preparation for git migration.Eric S. Raymond2014-10-311-2/+2
| | | | | | | | | | admin/notes/bzr: Renamed to notes/repo, reorganixed to separate VCS-dependent from VCS-independent stuff. Added guidance about commit-comment format under DVCSes. admin/notes/BRANCH: Merged into notes/repo. lisp/version.el: Fix some fallback values to conform to the actual release number.
* Replace "Maintainer: FSF" with the emacs-devel mailing addressGlenn Morris2014-02-091-1/+1
|
* Tweak earlier version.el changeGlenn Morris2014-01-221-3/+4
|
* * lisp/version.el (emacs-bzr-version-bzr): Fix typo.Glenn Morris2014-01-221-2/+2
|
* * version.el (emacs-repository-get-version): Avoid error if .git exists butGlenn Morris2014-01-221-2/+4
| | | | the git executable is not found.
* Fixes for emacs-repository-get-versionGlenn Morris2014-01-221-46/+44
| | | | | | | | | | | | * lisp/version.el (emacs-repository-get-version): Check either .bzr or .git, but not both. Make the git case actually use the DIR argument, and return nil rather than the empty string. * etc/NEWS: Don't mention that emacs-repository-version works for git, because it only returns nil (since it uses %N and there seem to be no notes in the git version of the Emacs repo.) No idea why this change is in trunk during a feature freeze anyway.
* Make the function emacs-repository-get-version polyvalent.Eric S. Raymond2014-01-111-34/+46
| | | | | | * version.el (emacs-repository-get-version): Enhance so the function works correctly in either a Bazaar or Git repo. The Bazaar case can be discarded after the repo transition.
* Restore compatibilty with 23.1 (Tested)Eric S. Raymond2014-01-101-0/+3
|
* Create a needed obsolete-variable alias. Fix up some docstrings.Eric S. Raymond2014-01-081-14/+18
|
* In preparation for the move to git, sanitize out some Bazaar-specific names.Eric S. Raymond2014-01-081-2/+2
| | | | | | | | * version.el (emacs-bzr-version): Name changed to emacs-repository-version. * loadup.el: Follow through on this name change. * lisp/mail/emacsbug.el (report-emacs-bug): Factor out any assumption about the version control system in use.
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
|
* lisp/*.el: Silence lexical-binding warnings.Juanma Barranquero2013-08-091-1/+1
|
* Update copyright notices for 2013.Paul Eggert2013-01-011-2/+2
|
* Add option to ask bzr itself for the emacs bzr revisionGlenn Morris2012-09-151-34/+60
| | | | | * lisp/version.el (emacs-bzr-version-bzr): New function. (emacs-bzr-get-version): Add optional EXTERNAL argument.
* Tweak previous emacs-bzr-get-version changeGlenn Morris2012-09-141-1/+1
|
* Improve emacs-bzr-version for lightweight checkouts (bug#12441)Glenn Morris2012-09-141-11/+36
| | | | | | | | * lisp/version.el (emacs-bzr-version): Doc fix. (emacs-bzr-version-dirstate): New function. (emacs-bzr-get-version): For lightweight checkouts, if the parent is local try and check that it matches the branch. If not, just use dirstate information.
* lips/version.el (*-version-string): Declare.Juanma Barranquero2012-05-271-0/+4
|
* There's no reason not to compile version.elGlenn Morris2012-05-251-18/+19
| | | | | | | | | | AFAICS, this is ancient code dating from when there was an "inc-vers.el", that was used to bump the build number on version.el. Nowadays that happens in loadup.el. * lisp/version.el: Remove no-byte-compile and associated formatting. * lisp/loadup.el: No need to load lisp/version.el uncompiled.
* Do not set a local value for version-control in version.elGlenn Morris2012-05-231-6/+1
| | | | | There's no reason to; this file isn't auto-generated or anything like that.
* Put the '$Id:' tag into MS-Windows executable of Emacs.Eli Zaretskii2012-04-201-3/+2
| | | | | lisp/version.el (top level): Put into the executable the ident-style '$Id:' tag on windows-nt as well.
* Doc fixes for emacs-bzr-* facilities.Eli Zaretskii2012-04-201-3/+5
| | | | lisp/version.el (emacs-bzr-version, emacs-bzr-get-version): Doc fixes.
* emacs-bzr-get-version tweakGlenn Morris2012-04-091-10/+26
| | | | | * lisp/version.el (emacs-bzr-get-version): Handle lightweight checkouts of local branches.
* Add emacs-bzr-versionGlenn Morris2012-04-071-0/+20
| | | | | | | | | | | * lisp/version.el (emacs-bzr-get-version): New function. * lisp/loadup.el (emacs-bzr-version): Set it. * lisp/mail/emacsbug.el (report-emacs-bug): Include bzr version. * etc/NEWS: Mention this, though it is not really relevant to releases. Insert template for 24.2 release. Fixes: debbugs:8054
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* * lisp/version.el (emacs-build-system): Give it a doc-string.Glenn Morris2011-11-231-5/+7
| | | | Consolidate local variables at the end of the file.
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
|
* Merge changes from emacs-23 branchChong Yidong2011-01-021-2/+1
|\
| * Set short copyright year to 2011.Glenn Morris2011-01-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | * lib-src/ebrowse.c (version) <emacs_copyright>: * lib-src/etags.c (print_version) <emacs_copyright>: * lib-src/rcs2log (Copyright): * lisp/version.el (emacs-copyright): * nextstep/Cocoa/Emacs.base/Contents/Info.plist: * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: Set short copyright year to 2011.
| * Bump version to 23.2.91.emacs-pretest-23.2.91Chong Yidong2010-12-101-1/+1
| | | | | | | | Regenerate configure and ldefs-boot.el.
View Lorry Controller Status