Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ini.syntax #2126

Closed
mc-butler opened this issue Apr 1, 2010 · 16 comments
Closed

ini.syntax #2126

mc-butler opened this issue Apr 1, 2010 · 16 comments
Assignees
Labels
area: mcedit mcedit, the built-in text editor prio: low Minor problem or easily worked around
Milestone

Comments

@mc-butler
Copy link

Important

This issue was migrated from Trac:

Origin https://midnight-commander.org/ticket/2126
Reporter zaytsev (@zyv)

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567046

From: Karsten Hilbert <karsten.hilbert@gmx.net>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: mc: INI syntax file proposition
Date: Tue, 26 Jan 2010 22:49:38 +0100
[Message part 1 (text/plain, inline)]
Package: mc
Version: 3:4.7.0.1-1
Severity: wishlist
Tags: patch
I am attaching a proposed syntax highlighting definition for
- gasp - DOS style INI files. You,
	[groups]
with
	option = value
and such. It would probably need to be tied to *.ini files.
Personally I also use it for *.conf files but that is by no
means safe to assume to be an INI style file.
I'd love to set the
	option
part in
	option = value
to some other color, too, but didn't find the proper syntax
for that.
Karsten

Note

Original attachments:

@mc-butler
Copy link
Author

Changed by zaytsev (@zyv) on Apr 1, 2010 at 11:04 UTC

@mc-butler
Copy link
Author

Changed by zaytsev (@zyv) on Apr 19, 2010 at 8:42 UTC (comment 1)

  • Severity changed from no branch to on review

Branch: 2126_ini_syntax (parent: master)
Changeset: [f25d1fbd2f53bcc618691be33022650b82ddce73]

@mc-butler
Copy link
Author

Changed by andrew_b (@aborodin) on Apr 19, 2010 at 9:08 UTC (comment 2)

  • Owner set to zaytsev
  • Status changed from new to assigned
  • Votes set to andrew_b

@mc-butler
Copy link
Author

Changed by zaytsev (@zyv) on Apr 23, 2010 at 9:03 UTC (comment 3)

Could someone clever please tell me how to set option = value to some other color as per original request? I'd be happy to apply the patch and squash the branch.

@mc-butler
Copy link
Author

Changed by slavazanko (@slavaz) on May 4, 2010 at 10:35 UTC (comment 4)

  • Severity changed from on review to approved
  • Votes changed from andrew_b to andrew_b slavazanko

@mc-butler
Copy link
Author

Changed by zaytsev (@zyv) on May 4, 2010 at 10:53 UTC (comment 5)

Did anyone see my question above about highlighting of the first part? I have no clue how to implement this correctly, but if someone comes up with the solution after merge I'll have to reopen and merge again for just few lines... Egh?

@mc-butler
Copy link
Author

Changed by slavazanko (@slavaz) on May 4, 2010 at 11:50 UTC (comment 6)

See [a25431452305fdc471bcccd3bdbcbe9b5965113f]

Also, no need to create separate branch (and tickect) for syntax-highlight related patches: http://midnight-commander.org/wiki/WorkingGuideLines#Directcommits

@mc-butler
Copy link
Author

Changed by zaytsev (@zyv) on May 4, 2010 at 14:22 UTC (comment 7)

  • Status changed from assigned to accepted

Hi Slava!

Looks cool! Shall I merge this or you want to use this branch for something else? Sorry for creating the branch, I'm out of Jabber till at least next week. I would have asked there otherwise.

Z.

@mc-butler
Copy link
Author

Changed by slavazanko (@slavaz) on May 4, 2010 at 14:26 UTC (comment 8)

Shall I merge this or you want to use this branch for something else?

Just merge.

@mc-butler
Copy link
Author

Changed by zaytsev (@zyv) on May 4, 2010 at 14:42 UTC (comment 9)

  • Severity changed from approved to merged
  • Votes changed from andrew_b slavazanko to committed-master committed-stable
  • Resolution set to fixed
  • Status changed from accepted to testing

Committed to master. Merge changeset: [bfd0b2c].
Cherry-picked to 4.7.0-stable, changeset: [03fdddf].

@mc-butler
Copy link
Author

Changed by zaytsev (@zyv) on May 4, 2010 at 14:46 UTC (comment 10)

  • Status changed from testing to closed

@mc-butler
Copy link
Author

Changed by andrew_b (@aborodin) on May 4, 2010 at 14:49 UTC (comment 11)

  • Description edited

Don't forget remove the merged branch.

@mc-butler
Copy link
Author

Changed by zaytsev (@zyv) on May 4, 2010 at 15:06 UTC (comment 12)

Actually, I can't:

zyv@mypride:~/Documents/test/mc-git$ git push origin :2149_patchfs_single_line
error: unable to push to unqualified destination: 2149_patchfs_single_line
The destination refspec neither matches an existing ref on the remote nor
begins with refs/, and we are unable to guess a prefix based on the source ref.
error: failed to push some refs to 'ssh+git://midnight-commander.org/git/mc.git'

zyv@mypride:~/Documents/test/mc-git$ git push origin :refs/origin/2149_patchfs_single_line
warning: Allowing deletion of corrupt ref.
*** Unknown type of update to refs/origin/2149_patchfs_single_line ()
***  - no email generated
error: hooks/post-receive exited with error code 1
To ssh+git://midnight-commander.org/git/mc.git
 - [deleted]         refs/origin/2149_patchfs_single_line

zyv@mypride:~/Documents/test/mc-git$ git branch -r
  origin/2149_patchfs_single_line

I use the latest git FYI.

@mc-butler
Copy link
Author

Changed by slavazanko (@slavaz) on May 4, 2010 at 15:10 UTC (comment 13)

$ git pull
Already up-to-date.
$ git branch -r | grep -c 2149
0

Looks as your local problems. Check your loal copy of repo.

also, run:

git remote prune origin

for cleanup of removed branches.

@mc-butler
Copy link
Author

Changed by slavazanko (@slavaz) on May 4, 2010 at 15:13 UTC (comment 14)

and why you looking at '2149_patchfs_single_line' branch? Is this branch is actial for this ticket? :)

@mc-butler
Copy link
Author

Changed by zaytsev (@zyv) on May 4, 2010 at 15:16 UTC (comment 15)

Thanks! The pruning thing fixed the issue for me. I couldn't delete this one, so I tried another one which I know was already merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: mcedit mcedit, the built-in text editor prio: low Minor problem or easily worked around
Development

No branches or pull requests

2 participants